diff --git a/scripts/map b/scripts/map
index 58193bd3..00d0eba9 100755
--- a/scripts/map
+++ b/scripts/map
@@ -13,12 +13,12 @@ require __DIR__ . "/../vendor/autoload.php";
 class BlackbaudMap extends Map {
   protected function getNamespaceFromSpec(string $specPath, OpenApi $spec, string $baseNamespace): string
   {
-    return Path::join("\\",[$baseNamespace, preg_replace("/[^a-z0-9_]+/i", "", $spec->info->title)]);
+    return Path::join("\\",array_merge([$baseNamespace], explode(" ", $spec->info->title)));
   }
   
   protected function getBasePathFromSpec(string $specPath, OpenApi $spec, string $basePath): string
   {
-    return Path::join($basePath, preg_replace("/[^a-z0-9_]+/i", "", $spec->info->title));  
+    return Path::join(array_merge([$basePath], explode(" ", $spec->info->title)));  
   }
 }