diff --git a/src/SmallWorld-Core/SmallBaselineLoadScript.class.st b/src/SmallWorld-Core/SmallBaselineLoadScript.class.st
index 9ef74f8..5c3dd01 100644
--- a/src/SmallWorld-Core/SmallBaselineLoadScript.class.st
+++ b/src/SmallWorld-Core/SmallBaselineLoadScript.class.st
@@ -30,7 +30,7 @@ SmallBaselineLoadScript >> baselineClass [
 
 { #category : #accessing }
 SmallBaselineLoadScript >> baselineName [
-	^ baselineName ifNil: [ self project name copyWithout: Character space ]
+	^ baselineName ifNil: [ self project name select: #isAlphaNumeric ]
 ]
 
 { #category : #accessing }
diff --git a/src/SmallWorld-Core/SmallProject.class.st b/src/SmallWorld-Core/SmallProject.class.st
index 864f185..51846c3 100644
--- a/src/SmallWorld-Core/SmallProject.class.st
+++ b/src/SmallWorld-Core/SmallProject.class.st
@@ -60,12 +60,6 @@ SmallProject >> baselineLoadSnippet [
 			#repoURL -> self repository directDownloadURL } asDictionary
 ]
 
-{ #category : #baselines }
-SmallProject >> baselineName [
-	
-	^ self name select: #isLetter
-]
-
 { #category : #magritte }
 SmallProject >> cloneConsoleDescription [
 	<magritteActionDescription>
diff --git a/src/SmallWorld-Core/SmallSmalltalkSton.class.st b/src/SmallWorld-Core/SmallSmalltalkSton.class.st
index a0f4244..f55c068 100644
--- a/src/SmallWorld-Core/SmallSmalltalkSton.class.st
+++ b/src/SmallWorld-Core/SmallSmalltalkSton.class.st
@@ -27,7 +27,7 @@ SmallSmalltalkSton >> currentContents [
 SmallSmalltalkSton >> desiredContents [
 
 	^ self template format: { 
-		#baseline -> self project baselineName.
+		#baseline -> self project loadScript baselineName.
 		#codeSubfolder -> self project repository codeSubfolder } asDictionary.
 ]