diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt
index 15dd4917..c0d0304a 100644
--- a/Sources/CMakeLists.txt
+++ b/Sources/CMakeLists.txt
@@ -23,6 +23,7 @@ function(SwiftBuild_Bundle)
     COMMAND
       ${CMAKE_COMMAND} -E copy_if_different ${BundleXCSpecs_FILES} "${CMAKE_BINARY_DIR}/share/pm/SwiftBuild_${BundleXCSpecs_MODULE}.resources/")
 
+
   file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/share/pm/SwiftBuild_${BundleXCSpecs_MODULE}.resources" _SWIFT_BUILD_RESOURCE_BUNDLE_BUILD_PATH)
   file(CONFIGURE
     OUTPUT "${CMAKE_BINARY_DIR}/resource_accessors/SwiftBuild_${BundleXCSpecs_MODULE}_resource_bundle_accessor.swift"
diff --git a/Sources/SWBApplePlatform/CMakeLists.txt b/Sources/SWBApplePlatform/CMakeLists.txt
index 49009e0b..e82db7a2 100644
--- a/Sources/SWBApplePlatform/CMakeLists.txt
+++ b/Sources/SWBApplePlatform/CMakeLists.txt
@@ -53,10 +53,10 @@ SwiftBuild_Bundle(MODULE SWBApplePlatform FILES
   Specs/CompileSkybox.xcspec
   Specs/CopyPNGFile.xcspec
   Specs/CopyTiffFile.xcspec
-  "Specs/Core Data.xcspec"
+  Specs/CoreData.xcspec
   Specs/CoreML.xcspec
-  "Specs/Darwin Package Types.xcspec"
-  "Specs/Darwin Product Types.xcspec"
+  Specs/DarwinPackageTypes.xcspec
+  Specs/DarwinProductTypes.xcspec
   Specs/DriverKit.xcspec
   Specs/DTrace.xcspec
   Specs/Embedded-Device.xcspec
@@ -75,18 +75,18 @@ SwiftBuild_Bundle(MODULE SWBApplePlatform FILES
   Specs/InfoPlistUtility.xcspec
   Specs/InstrumentsPackage.xcspec
   Specs/Intents.xcspec
-  "Specs/Interface Builder File Types.xcspec"
-  "Specs/iOS Device.xcspec"
-  "Specs/iOS Shared.xcspec"
-  "Specs/iOS Simulator.xcspec"
+  Specs/InterfaceBuilderFileTypes.xcspec
+  Specs/iOSDevice.xcspec
+  Specs/iOSShared.xcspec
+  Specs/iOSSimulator.xcspec
   Specs/KernelExtension.xcspec
   Specs/Lipo.xcspec
   Specs/LSRegisterURL.xcspec
-  "Specs/MacOSX Architectures.xcspec"
-  "Specs/MacOSX Core Build System.xcspec"
-  "Specs/MacOSX Native Build System.xcspec"
-  "Specs/MacOSX Package Types.xcspec"
-  "Specs/MacOSX Product Types.xcspec"
+  Specs/macOSArchitectures.xcspec
+  Specs/macOSCoreBuildSystem.xcspec
+  Specs/macOSNativeBuildSystem.xcspec
+  Specs/macOSPackageTypes.xcspec
+  Specs/macOSProductTypes.xcspec
   Specs/MetalCompiler.xcspec
   Specs/MetalFileTypes.xcspec
   Specs/MetalLinker.xcspec
@@ -100,22 +100,22 @@ SwiftBuild_Bundle(MODULE SWBApplePlatform FILES
   Specs/ReferenceObject.xcspec
   Specs/ResMerger.xcspec
   Specs/Rez.xcspec
-  "Specs/SceneKit FileTypes.xcspec"
-  "Specs/SceneKit Tools.xcspec"
+  Specs/SceneKitFileTypes.xcspec
+  Specs/SceneKitTools.xcspec
   Specs/SpriteKitFileTypes.xcspec
   Specs/TiffUtil.xcspec
-  "Specs/tvOS Device.xcspec"
-  "Specs/tvOS Shared.xcspec"
-  "Specs/tvOS Simulator.xcspec"
+  Specs/tvOSDevice.xcspec
+  Specs/tvOSShared.xcspec
+  Specs/tvOSSimulator.xcspec
   Specs/WatchKit1ProductTypes.xcspec
-  "Specs/watchOS Device.xcspec"
-  "Specs/watchOS Shared.xcspec"
-  "Specs/watchOS Simulator.xcspec"
+  Specs/watchOSDevice.xcspec
+  Specs/watchOSShared.xcspec
+  Specs/watchOSSimulator.xcspec
   Specs/XCAppExtensionPoints.xcspec
   Specs/XCStrings.xcspec
-  "Specs/xrOS Device.xcspec"
-  "Specs/xrOS Shared.xcspec"
-  "Specs/xrOS Simulator.xcspec")
+  Specs/xrOSDevice.xcspec
+  Specs/xrOSShared.xcspec
+  Specs/xrOSSimulator.xcspec)
 set_target_properties(SWBApplePlatform PROPERTIES
   Swift_LANGUAGE_VERSION 6)
 target_link_libraries(SWBApplePlatform PUBLIC
diff --git a/Sources/SWBApplePlatform/Specs/Core Data.xcspec b/Sources/SWBApplePlatform/Specs/CoreData.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/Core Data.xcspec
rename to Sources/SWBApplePlatform/Specs/CoreData.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/Darwin Package Types.xcspec b/Sources/SWBApplePlatform/Specs/DarwinPackageTypes.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/Darwin Package Types.xcspec
rename to Sources/SWBApplePlatform/Specs/DarwinPackageTypes.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/Darwin Product Types.xcspec b/Sources/SWBApplePlatform/Specs/DarwinProductTypes.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/Darwin Product Types.xcspec
rename to Sources/SWBApplePlatform/Specs/DarwinProductTypes.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/Interface Builder File Types.xcspec b/Sources/SWBApplePlatform/Specs/InterfaceBuilderFileTypes.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/Interface Builder File Types.xcspec
rename to Sources/SWBApplePlatform/Specs/InterfaceBuilderFileTypes.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/SceneKit FileTypes.xcspec b/Sources/SWBApplePlatform/Specs/SceneKitFileTypes.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/SceneKit FileTypes.xcspec
rename to Sources/SWBApplePlatform/Specs/SceneKitFileTypes.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/SceneKit Tools.xcspec b/Sources/SWBApplePlatform/Specs/SceneKitTools.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/SceneKit Tools.xcspec
rename to Sources/SWBApplePlatform/Specs/SceneKitTools.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/iOS Device.xcspec b/Sources/SWBApplePlatform/Specs/iOSDevice.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/iOS Device.xcspec
rename to Sources/SWBApplePlatform/Specs/iOSDevice.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/iOS Shared.xcspec b/Sources/SWBApplePlatform/Specs/iOSShared.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/iOS Shared.xcspec
rename to Sources/SWBApplePlatform/Specs/iOSShared.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/iOS Simulator.xcspec b/Sources/SWBApplePlatform/Specs/iOSSimulator.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/iOS Simulator.xcspec
rename to Sources/SWBApplePlatform/Specs/iOSSimulator.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/MacOSX Architectures.xcspec b/Sources/SWBApplePlatform/Specs/macOSArchitectures.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/MacOSX Architectures.xcspec
rename to Sources/SWBApplePlatform/Specs/macOSArchitectures.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/MacOSX Core Build System.xcspec b/Sources/SWBApplePlatform/Specs/macOSCoreBuildSystem.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/MacOSX Core Build System.xcspec
rename to Sources/SWBApplePlatform/Specs/macOSCoreBuildSystem.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/MacOSX Native Build System.xcspec b/Sources/SWBApplePlatform/Specs/macOSNativeBuildSystem.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/MacOSX Native Build System.xcspec
rename to Sources/SWBApplePlatform/Specs/macOSNativeBuildSystem.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/MacOSX Package Types.xcspec b/Sources/SWBApplePlatform/Specs/macOSPackageTypes.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/MacOSX Package Types.xcspec
rename to Sources/SWBApplePlatform/Specs/macOSPackageTypes.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/MacOSX Product Types.xcspec b/Sources/SWBApplePlatform/Specs/macOSProductTypes.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/MacOSX Product Types.xcspec
rename to Sources/SWBApplePlatform/Specs/macOSProductTypes.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/tvOS Device.xcspec b/Sources/SWBApplePlatform/Specs/tvOSDevice.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/tvOS Device.xcspec
rename to Sources/SWBApplePlatform/Specs/tvOSDevice.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/tvOS Shared.xcspec b/Sources/SWBApplePlatform/Specs/tvOSShared.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/tvOS Shared.xcspec
rename to Sources/SWBApplePlatform/Specs/tvOSShared.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/tvOS Simulator.xcspec b/Sources/SWBApplePlatform/Specs/tvOSSimulator.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/tvOS Simulator.xcspec
rename to Sources/SWBApplePlatform/Specs/tvOSSimulator.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/watchOS Device.xcspec b/Sources/SWBApplePlatform/Specs/watchOSDevice.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/watchOS Device.xcspec
rename to Sources/SWBApplePlatform/Specs/watchOSDevice.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/watchOS Shared.xcspec b/Sources/SWBApplePlatform/Specs/watchOSShared.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/watchOS Shared.xcspec
rename to Sources/SWBApplePlatform/Specs/watchOSShared.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/watchOS Simulator.xcspec b/Sources/SWBApplePlatform/Specs/watchOSSimulator.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/watchOS Simulator.xcspec
rename to Sources/SWBApplePlatform/Specs/watchOSSimulator.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/xrOS Device.xcspec b/Sources/SWBApplePlatform/Specs/xrOSDevice.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/xrOS Device.xcspec
rename to Sources/SWBApplePlatform/Specs/xrOSDevice.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/xrOS Shared.xcspec b/Sources/SWBApplePlatform/Specs/xrOSShared.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/xrOS Shared.xcspec
rename to Sources/SWBApplePlatform/Specs/xrOSShared.xcspec
diff --git a/Sources/SWBApplePlatform/Specs/xrOS Simulator.xcspec b/Sources/SWBApplePlatform/Specs/xrOSSimulator.xcspec
similarity index 100%
rename from Sources/SWBApplePlatform/Specs/xrOS Simulator.xcspec
rename to Sources/SWBApplePlatform/Specs/xrOSSimulator.xcspec
diff --git a/Sources/SWBUniversalPlatform/CMakeLists.txt b/Sources/SWBUniversalPlatform/CMakeLists.txt
index 796d74a1..90c37a6c 100644
--- a/Sources/SWBUniversalPlatform/CMakeLists.txt
+++ b/Sources/SWBUniversalPlatform/CMakeLists.txt
@@ -23,7 +23,7 @@ SwiftBuild_Bundle(MODULE SWBUniversalPlatform FILES
   Specs/BuiltInBuildRules.xcbuildrules
   Specs/BuiltInCompilers.xcspec
   Specs/BuiltInFileTypes.xcspec
-  "Specs/Clang LLVM 1.0.xcspec"
+  Specs/Clang.xcspec
   Specs/ClangModuleVerifierInputGenerator.xcspec
   Specs/ClangStatCache.xcspec
   Specs/ClangSymbolExtractor.xcspec
@@ -32,7 +32,7 @@ SwiftBuild_Bundle(MODULE SWBUniversalPlatform FILES
   Specs/CopyPlistFile.xcspec
   Specs/CopyStringsFile.xcspec
   Specs/Cpp.xcspec
-  "Specs/Default Compiler.xcspec"
+  Specs/DefaultCompiler.xcspec
   Specs/Documentation.xcspec
   Specs/Ld.xcspec
   Specs/Lex.xcspec
diff --git a/Sources/SWBUniversalPlatform/Specs/Clang LLVM 1.0.xcspec b/Sources/SWBUniversalPlatform/Specs/Clang.xcspec
similarity index 100%
rename from Sources/SWBUniversalPlatform/Specs/Clang LLVM 1.0.xcspec
rename to Sources/SWBUniversalPlatform/Specs/Clang.xcspec
diff --git a/Sources/SWBUniversalPlatform/Specs/Default Compiler.xcspec b/Sources/SWBUniversalPlatform/Specs/DefaultCompiler.xcspec
similarity index 100%
rename from Sources/SWBUniversalPlatform/Specs/Default Compiler.xcspec
rename to Sources/SWBUniversalPlatform/Specs/DefaultCompiler.xcspec