diff --git a/Makefile b/Makefile
index 297de0caf..6a93692bf 100644
--- a/Makefile
+++ b/Makefile
@@ -534,14 +534,22 @@ test: test-all
 .PHONY: test-clean
 test-clean: test-all-clean
 
+ifdef SKIP_VERSION
+SKIP_GIT := yes
+endif
+
 # Generate the version.h file
 ifndef SKIP_GIT
     GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d-%H:%M:%S")
 else
     GIT_VERSION := NA
 endif
+ifndef SKIP_VERSION
 BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S")
 $(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(ROOT_DIR)/quantum/version.h)
 $(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(ROOT_DIR)/quantum/version.h)
+else
+BUILD_DATE := NA
+endif
 
 include $(ROOT_DIR)/testlist.mk
diff --git a/keyboards/handwired/MS-sculpt-mobile/MS-sculpt-mobile.c b/keyboards/handwired/MS_sculpt_mobile/MS_sculpt_mobile.c
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/MS-sculpt-mobile.c
rename to keyboards/handwired/MS_sculpt_mobile/MS_sculpt_mobile.c
diff --git a/keyboards/handwired/MS-sculpt-mobile/MS-sculpt-mobile.h b/keyboards/handwired/MS_sculpt_mobile/MS_sculpt_mobile.h
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/MS-sculpt-mobile.h
rename to keyboards/handwired/MS_sculpt_mobile/MS_sculpt_mobile.h
diff --git a/keyboards/handwired/MS-sculpt-mobile/Makefile b/keyboards/handwired/MS_sculpt_mobile/Makefile
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/Makefile
rename to keyboards/handwired/MS_sculpt_mobile/Makefile
diff --git a/keyboards/handwired/MS-sculpt-mobile/babblePaste.c b/keyboards/handwired/MS_sculpt_mobile/babblePaste.c
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/babblePaste.c
rename to keyboards/handwired/MS_sculpt_mobile/babblePaste.c
diff --git a/keyboards/handwired/MS-sculpt-mobile/babblePaste.h b/keyboards/handwired/MS_sculpt_mobile/babblePaste.h
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/babblePaste.h
rename to keyboards/handwired/MS_sculpt_mobile/babblePaste.h
diff --git a/keyboards/handwired/MS-sculpt-mobile/babblePaste.txt b/keyboards/handwired/MS_sculpt_mobile/babblePaste.txt
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/babblePaste.txt
rename to keyboards/handwired/MS_sculpt_mobile/babblePaste.txt
diff --git a/keyboards/handwired/MS-sculpt-mobile/config.h b/keyboards/handwired/MS_sculpt_mobile/config.h
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/config.h
rename to keyboards/handwired/MS_sculpt_mobile/config.h
diff --git a/keyboards/handwired/MS-sculpt-mobile/keymaps/default/Makefile b/keyboards/handwired/MS_sculpt_mobile/keymaps/default/Makefile
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/keymaps/default/Makefile
rename to keyboards/handwired/MS_sculpt_mobile/keymaps/default/Makefile
diff --git a/keyboards/handwired/MS-sculpt-mobile/keymaps/default/config.h b/keyboards/handwired/MS_sculpt_mobile/keymaps/default/config.h
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/keymaps/default/config.h
rename to keyboards/handwired/MS_sculpt_mobile/keymaps/default/config.h
diff --git a/keyboards/handwired/MS-sculpt-mobile/keymaps/default/keymap.c b/keyboards/handwired/MS_sculpt_mobile/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/keymaps/default/keymap.c
rename to keyboards/handwired/MS_sculpt_mobile/keymaps/default/keymap.c
diff --git a/keyboards/handwired/MS-sculpt-mobile/keymaps/default/readme.md b/keyboards/handwired/MS_sculpt_mobile/keymaps/default/readme.md
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/keymaps/default/readme.md
rename to keyboards/handwired/MS_sculpt_mobile/keymaps/default/readme.md
diff --git a/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/Makefile b/keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/Makefile
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/Makefile
rename to keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/Makefile
diff --git a/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/config.h b/keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/config.h
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/config.h
rename to keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/config.h
diff --git a/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/keymap.c b/keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/keymap.c
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/keymap.c
rename to keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/keymap.c
diff --git a/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/readme.md b/keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/readme.md
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/readme.md
rename to keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/readme.md
diff --git a/keyboards/handwired/MS-sculpt-mobile/readme.md b/keyboards/handwired/MS_sculpt_mobile/readme.md
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/readme.md
rename to keyboards/handwired/MS_sculpt_mobile/readme.md
diff --git a/keyboards/handwired/MS-sculpt-mobile/rules.mk b/keyboards/handwired/MS_sculpt_mobile/rules.mk
similarity index 100%
rename from keyboards/handwired/MS-sculpt-mobile/rules.mk
rename to keyboards/handwired/MS_sculpt_mobile/rules.mk