diff --git a/Keyboards/ergodox.bash b/Keyboards/ergodox.bash
index 1865dce..c72da66 100755
--- a/Keyboards/ergodox.bash
+++ b/Keyboards/ergodox.bash
@@ -45,7 +45,7 @@ PartialMaps[2]="iced_numpad"
 # NOTE: Changing any of these variables will require a force build to compile correctly
 
 # Keyboard Module Configuration
-ScanModule="MDErgo1"
+ScanModule="Infinity_Ergodox"
 MacroModule="PartialMap"
 OutputModule="pjrcUSB"
 DebugModule="full"
diff --git a/Keyboards/infinity.bash b/Keyboards/infinity.bash
index 79cb02a..7666bd9 100755
--- a/Keyboards/infinity.bash
+++ b/Keyboards/infinity.bash
@@ -42,7 +42,7 @@ PartialMaps[1]="hhkbpro2"
 # NOTE: Changing any of these variables will require a force build to compile correctly
 
 # Keyboard Module Configuration
-ScanModule="MD1"
+ScanModule="Infinity_60%"
 MacroModule="PartialMap"
 OutputModule="pjrcUSB"
 DebugModule="full"
diff --git a/Keyboards/infinity_led.bash b/Keyboards/infinity_led.bash
index c753b2f..aff2226 100755
--- a/Keyboards/infinity_led.bash
+++ b/Keyboards/infinity_led.bash
@@ -42,7 +42,7 @@ PartialMaps[1]="hhkbpro2"
 # NOTE: Changing any of these variables will require a force build to compile correctly
 
 # Keyboard Module Configuration
-ScanModule="MD1.1"
+ScanModule="Infinity_60%_LED"
 MacroModule="PartialMap"
 OutputModule="pjrcUSB"
 DebugModule="full"
diff --git a/Keyboards/template.bash b/Keyboards/template.bash
index acbe954..eb27842 100755
--- a/Keyboards/template.bash
+++ b/Keyboards/template.bash
@@ -43,7 +43,7 @@ PartialMaps[2]="colemak"
 # NOTE: Changing any of these variables will require a force build to compile correctly
 
 # Keyboard Module Configuration
-ScanModule="MD1"
+ScanModule="Infinity_60%"
 MacroModule="PartialMap"
 OutputModule="pjrcUSB"
 DebugModule="full"
diff --git a/Scan/MD1/matrix.h b/Scan/Infinity_60%/matrix.h
similarity index 100%
rename from Scan/MD1/matrix.h
rename to Scan/Infinity_60%/matrix.h
diff --git a/Scan/MD1/pinout b/Scan/Infinity_60%/pinout
similarity index 100%
rename from Scan/MD1/pinout
rename to Scan/Infinity_60%/pinout
diff --git a/Scan/MD1/prototype.kll b/Scan/Infinity_60%/prototype.kll
similarity index 100%
rename from Scan/MD1/prototype.kll
rename to Scan/Infinity_60%/prototype.kll
diff --git a/Scan/MD1/scan_loop.c b/Scan/Infinity_60%/scan_loop.c
similarity index 100%
rename from Scan/MD1/scan_loop.c
rename to Scan/Infinity_60%/scan_loop.c
diff --git a/Scan/MD1.1/scan_loop.h b/Scan/Infinity_60%/scan_loop.h
similarity index 100%
rename from Scan/MD1.1/scan_loop.h
rename to Scan/Infinity_60%/scan_loop.h
diff --git a/Scan/MD1/scancode_map.kll b/Scan/Infinity_60%/scancode_map.kll
similarity index 100%
rename from Scan/MD1/scancode_map.kll
rename to Scan/Infinity_60%/scancode_map.kll
diff --git a/Scan/MD1/setup.cmake b/Scan/Infinity_60%/setup.cmake
similarity index 100%
rename from Scan/MD1/setup.cmake
rename to Scan/Infinity_60%/setup.cmake
diff --git a/Scan/MD1.1/matrix.h b/Scan/Infinity_60%_LED/matrix.h
similarity index 100%
rename from Scan/MD1.1/matrix.h
rename to Scan/Infinity_60%_LED/matrix.h
diff --git a/Scan/MD1.1/pinout b/Scan/Infinity_60%_LED/pinout
similarity index 100%
rename from Scan/MD1.1/pinout
rename to Scan/Infinity_60%_LED/pinout
diff --git a/Scan/MD1.1/scan_loop.c b/Scan/Infinity_60%_LED/scan_loop.c
similarity index 100%
rename from Scan/MD1.1/scan_loop.c
rename to Scan/Infinity_60%_LED/scan_loop.c
diff --git a/Scan/MD1/scan_loop.h b/Scan/Infinity_60%_LED/scan_loop.h
similarity index 100%
rename from Scan/MD1/scan_loop.h
rename to Scan/Infinity_60%_LED/scan_loop.h
diff --git a/Scan/MD1.1/scancode_map.kll b/Scan/Infinity_60%_LED/scancode_map.kll
similarity index 100%
rename from Scan/MD1.1/scancode_map.kll
rename to Scan/Infinity_60%_LED/scancode_map.kll
diff --git a/Scan/MD1.1/setup.cmake b/Scan/Infinity_60%_LED/setup.cmake
similarity index 100%
rename from Scan/MD1.1/setup.cmake
rename to Scan/Infinity_60%_LED/setup.cmake
diff --git a/Scan/MDErgo1/led_conf.h b/Scan/Infinity_Ergodox/led_conf.h
similarity index 100%
rename from Scan/MDErgo1/led_conf.h
rename to Scan/Infinity_Ergodox/led_conf.h
diff --git a/Scan/MDErgo1/leftHand.kll b/Scan/Infinity_Ergodox/leftHand.kll
similarity index 100%
rename from Scan/MDErgo1/leftHand.kll
rename to Scan/Infinity_Ergodox/leftHand.kll
diff --git a/Scan/MDErgo1/leftThenRight.kll b/Scan/Infinity_Ergodox/leftThenRight.kll
similarity index 100%
rename from Scan/MDErgo1/leftThenRight.kll
rename to Scan/Infinity_Ergodox/leftThenRight.kll
diff --git a/Scan/MDErgo1/matrix.h b/Scan/Infinity_Ergodox/matrix.h
similarity index 100%
rename from Scan/MDErgo1/matrix.h
rename to Scan/Infinity_Ergodox/matrix.h
diff --git a/Scan/MDErgo1/pinout b/Scan/Infinity_Ergodox/pinout
similarity index 100%
rename from Scan/MDErgo1/pinout
rename to Scan/Infinity_Ergodox/pinout
diff --git a/Scan/MDErgo1/rightHand.kll b/Scan/Infinity_Ergodox/rightHand.kll
similarity index 100%
rename from Scan/MDErgo1/rightHand.kll
rename to Scan/Infinity_Ergodox/rightHand.kll
diff --git a/Scan/MDErgo1/scan_loop.c b/Scan/Infinity_Ergodox/scan_loop.c
similarity index 100%
rename from Scan/MDErgo1/scan_loop.c
rename to Scan/Infinity_Ergodox/scan_loop.c
diff --git a/Scan/KType/scan_loop.h b/Scan/Infinity_Ergodox/scan_loop.h
similarity index 100%
rename from Scan/KType/scan_loop.h
rename to Scan/Infinity_Ergodox/scan_loop.h
diff --git a/Scan/MDErgo1/scancode_map.kll b/Scan/Infinity_Ergodox/scancode_map.kll
similarity index 100%
rename from Scan/MDErgo1/scancode_map.kll
rename to Scan/Infinity_Ergodox/scancode_map.kll
diff --git a/Scan/MDErgo1/setup.cmake b/Scan/Infinity_Ergodox/setup.cmake
similarity index 100%
rename from Scan/MDErgo1/setup.cmake
rename to Scan/Infinity_Ergodox/setup.cmake
diff --git a/Scan/MDErgo1/slave1.kll b/Scan/Infinity_Ergodox/slave1.kll
similarity index 100%
rename from Scan/MDErgo1/slave1.kll
rename to Scan/Infinity_Ergodox/slave1.kll
diff --git a/Scan/KType/matrix.h b/Scan/K-Type/matrix.h
similarity index 100%
rename from Scan/KType/matrix.h
rename to Scan/K-Type/matrix.h
diff --git a/Scan/KType/scan_loop.c b/Scan/K-Type/scan_loop.c
similarity index 100%
rename from Scan/KType/scan_loop.c
rename to Scan/K-Type/scan_loop.c
diff --git a/Scan/MDErgo1/scan_loop.h b/Scan/K-Type/scan_loop.h
similarity index 100%
rename from Scan/MDErgo1/scan_loop.h
rename to Scan/K-Type/scan_loop.h
diff --git a/Scan/KType/defaultMap.kll b/Scan/K-Type/scancode_map.kll
similarity index 100%
rename from Scan/KType/defaultMap.kll
rename to Scan/K-Type/scancode_map.kll
diff --git a/Scan/KType/setup.cmake b/Scan/K-Type/setup.cmake
similarity index 100%
rename from Scan/KType/setup.cmake
rename to Scan/K-Type/setup.cmake
diff --git a/Scan/MD1 b/Scan/MD1
new file mode 120000
index 0000000..35010ee
--- /dev/null
+++ b/Scan/MD1
@@ -0,0 +1 @@
+Infinity_60%
\ No newline at end of file
diff --git a/Scan/MD1.1 b/Scan/MD1.1
new file mode 120000
index 0000000..8315796
--- /dev/null
+++ b/Scan/MD1.1
@@ -0,0 +1 @@
+Infinity_60%_LED
\ No newline at end of file
diff --git a/Scan/MDErgo1 b/Scan/MDErgo1
new file mode 120000
index 0000000..d844640
--- /dev/null
+++ b/Scan/MDErgo1
@@ -0,0 +1 @@
+Infinity_Ergodox
\ No newline at end of file