diff --git a/mods/[all-based]/SetupComplete - basic bootux/data/Windows/Setup/Scripts/SetupComplete/basic bootux/SetupComplete.cmd b/mods/[all-based]/basic bootux/data/Windows/Setup/Scripts/SetupComplete/basic bootux/SetupComplete.cmd
similarity index 100%
rename from mods/[all-based]/SetupComplete - basic bootux/data/Windows/Setup/Scripts/SetupComplete/basic bootux/SetupComplete.cmd
rename to mods/[all-based]/basic bootux/data/Windows/Setup/Scripts/SetupComplete/basic bootux/SetupComplete.cmd
diff --git a/mods/[all-based]/SetupComplete - disable winsat schedule/data/Windows/Setup/Scripts/SetupComplete/disable winsat schedule/SetupComplete.cmd b/mods/[all-based]/disable winsat schedule/data/Windows/Setup/Scripts/SetupComplete/disable winsat schedule/SetupComplete.cmd
similarity index 100%
rename from mods/[all-based]/SetupComplete - disable winsat schedule/data/Windows/Setup/Scripts/SetupComplete/disable winsat schedule/SetupComplete.cmd
rename to mods/[all-based]/disable winsat schedule/data/Windows/Setup/Scripts/SetupComplete/disable winsat schedule/SetupComplete.cmd
diff --git a/mods/[all-based]/userSetup - remove IE and WMP pins/data/opus-nt/userSetup/removepins.cmd b/mods/[all-based]/remove IE and WMP pins/data/opus-nt/userSetup/removepins.cmd
similarity index 100%
rename from mods/[all-based]/userSetup - remove IE and WMP pins/data/opus-nt/userSetup/removepins.cmd
rename to mods/[all-based]/remove IE and WMP pins/data/opus-nt/userSetup/removepins.cmd
diff --git a/mods/[all-based]/userSetup - remove IE and WMP pins/data/opus-nt/userSetup/removepins.vbs b/mods/[all-based]/remove IE and WMP pins/data/opus-nt/userSetup/removepins.vbs
similarity index 100%
rename from mods/[all-based]/userSetup - remove IE and WMP pins/data/opus-nt/userSetup/removepins.vbs
rename to mods/[all-based]/remove IE and WMP pins/data/opus-nt/userSetup/removepins.vbs
diff --git a/mods/[all-based]/userSetup - replace favorites with user shortcut/data/opus-nt/userSetup/setfavorites.cmd b/mods/[all-based]/replace favorites with user shortcut/data/opus-nt/userSetup/setfavorites.cmd
similarity index 100%
rename from mods/[all-based]/userSetup - replace favorites with user shortcut/data/opus-nt/userSetup/setfavorites.cmd
rename to mods/[all-based]/replace favorites with user shortcut/data/opus-nt/userSetup/setfavorites.cmd
diff --git a/mods/[all-nu]/postSetup - uninstall pc health check/data/opus-nt/postSetup/uninstall-pchc.cmd b/mods/[all-nu]/uninstall pc health check/data/opus-nt/postSetup/uninstall-pchc.cmd
similarity index 100%
rename from mods/[all-nu]/postSetup - uninstall pc health check/data/opus-nt/postSetup/uninstall-pchc.cmd
rename to mods/[all-nu]/uninstall pc health check/data/opus-nt/postSetup/uninstall-pchc.cmd
diff --git a/mods/[all-nu]/postSetup - uninstall pc health check/data/opus-nt/postSetup/uninstall-pchc.vbs b/mods/[all-nu]/uninstall pc health check/data/opus-nt/postSetup/uninstall-pchc.vbs
similarity index 100%
rename from mods/[all-nu]/postSetup - uninstall pc health check/data/opus-nt/postSetup/uninstall-pchc.vbs
rename to mods/[all-nu]/uninstall pc health check/data/opus-nt/postSetup/uninstall-pchc.vbs
diff --git a/mods/[all-nu]/postSetup - uninstall pc health check/modscript.py b/mods/[all-nu]/uninstall pc health check/modscript.py
similarity index 100%
rename from mods/[all-nu]/postSetup - uninstall pc health check/modscript.py
rename to mods/[all-nu]/uninstall pc health check/modscript.py
diff --git a/mods/[hell]/SetupComplete - no start tiles/data/Windows/Setup/Scripts/SetupComplete/no-start-tiles/SetupComplete.cmd b/mods/[hell]/no start tiles/data/Windows/Setup/Scripts/SetupComplete/no-start-tiles/SetupComplete.cmd
similarity index 100%
rename from mods/[hell]/SetupComplete - no start tiles/data/Windows/Setup/Scripts/SetupComplete/no-start-tiles/SetupComplete.cmd
rename to mods/[hell]/no start tiles/data/Windows/Setup/Scripts/SetupComplete/no-start-tiles/SetupComplete.cmd
diff --git a/mods/[hell]/SetupComplete - no start tiles/data/opus-nt/StartLayout.xml b/mods/[hell]/no start tiles/data/opus-nt/StartLayout.xml
similarity index 100%
rename from mods/[hell]/SetupComplete - no start tiles/data/opus-nt/StartLayout.xml
rename to mods/[hell]/no start tiles/data/opus-nt/StartLayout.xml