diff --git a/repository/Seaside-Core.package/WAComboResponse.class/instance/commit.st b/repository/Seaside-Core.package/WAComboResponse.class/instance/commit.st
index 2d3addd18..ac5da2456 100644
--- a/repository/Seaside-Core.package/WAComboResponse.class/instance/commit.st
+++ b/repository/Seaside-Core.package/WAComboResponse.class/instance/commit.st
@@ -13,7 +13,7 @@ commit
 	"The external stream is usually byte based. Unfortunately, the
 	streams aren't compatible enough at the moment such that everything
 	could be written to the external stream directly (in particular, writing of
-	singel characters doesn't work). Luckily, the encoders already translate
+	single characters doesn't work). Luckily, the encoders already translate
 	characters to bytes, so we only need to wrap the stream with the appropariate
 	encoder. Header data is always ASCII encoded.
 	Because older versions of Seaside don't have a dedicated ASCII encoder we
diff --git a/repository/Seaside-Core.package/monticello.meta/categories.st b/repository/Seaside-Core.package/monticello.meta/categories.st
index c60fc8765..6d88cf02e 100644
--- a/repository/Seaside-Core.package/monticello.meta/categories.st
+++ b/repository/Seaside-Core.package/monticello.meta/categories.st
@@ -1,17 +1,17 @@
-SystemOrganization addCategory: #'Seaside-Core'!
-SystemOrganization addCategory: #'Seaside-Core-Backtracking'!
-SystemOrganization addCategory: #'Seaside-Core-Base'!
-SystemOrganization addCategory: #'Seaside-Core-Cache'!
-SystemOrganization addCategory: #'Seaside-Core-Callbacks'!
-SystemOrganization addCategory: #'Seaside-Core-Configuration'!
-SystemOrganization addCategory: #'Seaside-Core-Document'!
 SystemOrganization addCategory: #'Seaside-Core-Document-Elements'!
-SystemOrganization addCategory: #'Seaside-Core-Exceptions'!
-SystemOrganization addCategory: #'Seaside-Core-Filter'!
-SystemOrganization addCategory: #'Seaside-Core-HTTP'!
-SystemOrganization addCategory: #'Seaside-Core-Libraries'!
-SystemOrganization addCategory: #'Seaside-Core-Manifest'!
-SystemOrganization addCategory: #'Seaside-Core-Rendering'!
-SystemOrganization addCategory: #'Seaside-Core-RequestHandling'!
-SystemOrganization addCategory: #'Seaside-Core-Server'!
-SystemOrganization addCategory: #'Seaside-Core-Utilities'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Backtracking'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Base'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Cache'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Callbacks'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Configuration'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Document'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Exceptions'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Filter'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-HTTP'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Libraries'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Manifest'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Rendering'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-RequestHandling'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Server'!
+SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Utilities'!