diff --git a/source/BaselineOfStargate/BaselineOfStargate.class.st b/source/BaselineOfStargate/BaselineOfStargate.class.st
index eb1ff30..fb50c8f 100644
--- a/source/BaselineOfStargate/BaselineOfStargate.class.st
+++ b/source/BaselineOfStargate/BaselineOfStargate.class.st
@@ -1,11 +1,10 @@
 Class {
-	#name : 'BaselineOfStargate',
-	#superclass : 'BaselineOf',
-	#category : 'BaselineOfStargate',
-	#package : 'BaselineOfStargate'
+	#name : #BaselineOfStargate,
+	#superclass : #BaselineOf,
+	#category : #BaselineOfStargate
 }
 
-{ #category : 'baselines' }
+{ #category : #baselines }
 BaselineOfStargate >> baseline: spec [
 
 	<baseline>
@@ -20,13 +19,13 @@ BaselineOfStargate >> baseline: spec [
 			group: 'Development' with: #( 'Tests' 'Tools' ) ]
 ]
 
-{ #category : 'post-load actions' }
+{ #category : #'post-load actions' }
 BaselineOfStargate >> configureAsTransientInstancesOfAll: aClassCollection [
 
 	aClassCollection do: #makeInstancesDbTransient
 ]
 
-{ #category : 'post-load actions' }
+{ #category : #'post-load actions' }
 BaselineOfStargate >> configureInstancesOfStargateJSONRPCClassesAsTransient [
 
 	self configureAsTransientInstancesOfAll: {
@@ -34,7 +33,7 @@ BaselineOfStargate >> configureInstancesOfStargateJSONRPCClassesAsTransient [
 			JsonRPCRequestHandler }
 ]
 
-{ #category : 'post-load actions' }
+{ #category : #'post-load actions' }
 BaselineOfStargate >> configureInstancesOfStargateModelClassesAsTransient [
 
 	self configureAsTransientInstancesOfAll: {
@@ -43,13 +42,13 @@ BaselineOfStargate >> configureInstancesOfStargateModelClassesAsTransient [
 			ResourceRESTfulController }
 ]
 
-{ #category : 'accessing' }
+{ #category : #accessing }
 BaselineOfStargate >> projectClass [
 
 	^ MetacelloCypressBaselineProject
 ]
 
-{ #category : 'baselines' }
+{ #category : #baselines }
 BaselineOfStargate >> setUpCorePackages: spec [
 
 	spec
@@ -72,7 +71,7 @@ BaselineOfStargate >> setUpCorePackages: spec [
 			group: 'Deployment' with: extensionPackageName ]
 ]
 
-{ #category : 'baselines' }
+{ #category : #baselines }
 BaselineOfStargate >> setUpDependencies: spec [
 
 	spec
@@ -81,7 +80,7 @@ BaselineOfStargate >> setUpDependencies: spec [
 		project: 'Buoy-SUnit' copyFrom: 'Buoy' with: [ spec loads: 'Dependent-SUnit-Extensions' ].
 
 	spec
-		baseline: 'Hyperspace' with: [ spec repository: 'github://ba-st/Hyperspace:v5' ];
+		baseline: 'Hyperspace' with: [ spec repository: 'github://ba-st/Hyperspace:zinc-event-logger' ];
 		project: 'Hyperspace-Deployment' copyFrom: 'Hyperspace' with: [ spec loads: 'Deployment' ];
 		project: 'Hyperspace-Tools' copyFrom: 'Hyperspace' with: [ spec loads: 'Tools' ];
 		project: 'Hyperspace-SUnit'
@@ -106,7 +105,7 @@ BaselineOfStargate >> setUpDependencies: spec [
 		project: 'Launchpad-SUnit' copyFrom: 'Launchpad' with: [ spec loads: 'Dependent-SUnit-Extensions' ]
 ]
 
-{ #category : 'baselines' }
+{ #category : #baselines }
 BaselineOfStargate >> setUpDeploymentPackages: spec [
 
 	self setUpCorePackages: spec.
@@ -171,7 +170,7 @@ BaselineOfStargate >> setUpDeploymentPackages: spec [
 		group: 'Deployment' with: 'Stargate-API-Skeleton'
 ]
 
-{ #category : 'baselines' }
+{ #category : #baselines }
 BaselineOfStargate >> setUpPackages: spec [
 
 	self setUpDeploymentPackages: spec.
@@ -184,7 +183,7 @@ BaselineOfStargate >> setUpPackages: spec [
 	self setUpTestPackages: spec
 ]
 
-{ #category : 'baselines' }
+{ #category : #baselines }
 BaselineOfStargate >> setUpTestPackages: spec [
 
 	spec
diff --git a/source/BaselineOfStargate/package.st b/source/BaselineOfStargate/package.st
index 00ea1ab..5100385 100644
--- a/source/BaselineOfStargate/package.st
+++ b/source/BaselineOfStargate/package.st
@@ -1 +1 @@
-Package { #name : 'BaselineOfStargate' }
+Package { #name : #BaselineOfStargate }