diff --git a/CONFIG_FORMAT.md b/CONFIG_FORMAT.md
index 866293f..6879afa 100644
--- a/CONFIG_FORMAT.md
+++ b/CONFIG_FORMAT.md
@@ -210,7 +210,7 @@
 }
 ```
 
-[Full Configuration](https://github.com/openbmc/entity-manager/blob/master/configurations/WFT%20Baseboard.json)
+[Full Configuration](https://github.com/openbmc/entity-manager/blob/master/configurations/WFT_Baseboard.json)
 
 
 #### Configuration Records - Chassis Example
diff --git a/configurations/1Ux16 Riser.json b/configurations/1Ux16_Riser.json
similarity index 100%
rename from configurations/1Ux16 Riser.json
rename to configurations/1Ux16_Riser.json
diff --git a/configurations/2Ux8 Riser.json b/configurations/2Ux8_Riser.json
similarity index 100%
rename from configurations/2Ux8 Riser.json
rename to configurations/2Ux8_Riser.json
diff --git a/configurations/8X25 HSBP.json b/configurations/8X25_HSBP.json
similarity index 100%
rename from configurations/8X25 HSBP.json
rename to configurations/8X25_HSBP.json
diff --git a/configurations/BNP Baseboard.json b/configurations/BNP_Baseboard.json
similarity index 100%
rename from configurations/BNP Baseboard.json
rename to configurations/BNP_Baseboard.json
diff --git a/configurations/Delta DPS-750XB PSU.json b/configurations/Delta_DPS-750XB_PSU.json
similarity index 100%
rename from configurations/Delta DPS-750XB PSU.json
rename to configurations/Delta_DPS-750XB_PSU.json
diff --git a/configurations/F1U12X25 HSBP.json b/configurations/F1U12X25_HSBP.json
similarity index 100%
rename from configurations/F1U12X25 HSBP.json
rename to configurations/F1U12X25_HSBP.json
diff --git a/configurations/F1U4X25 HSBP.json b/configurations/F1U4X25_HSBP.json
similarity index 100%
rename from configurations/F1U4X25 HSBP.json
rename to configurations/F1U4X25_HSBP.json
diff --git a/configurations/F2U12X35 HSBP.json b/configurations/F2U12X35_HSBP.json
similarity index 100%
rename from configurations/F2U12X35 HSBP.json
rename to configurations/F2U12X35_HSBP.json
diff --git a/configurations/F2U8X25 HSBP.json b/configurations/F2U8X25_HSBP.json
similarity index 100%
rename from configurations/F2U8X25 HSBP.json
rename to configurations/F2U8X25_HSBP.json
diff --git a/configurations/Flextronics S-1100ADU00-201 PSU.json b/configurations/Flextronics_S-1100ADU00-201_PSU.json
similarity index 100%
rename from configurations/Flextronics S-1100ADU00-201 PSU.json
rename to configurations/Flextronics_S-1100ADU00-201_PSU.json
diff --git a/configurations/IBM 1000W CFFPS.json b/configurations/IBM_1000W_CFFPS.json
similarity index 100%
rename from configurations/IBM 1000W CFFPS.json
rename to configurations/IBM_1000W_CFFPS.json
diff --git a/configurations/IBM 1400W CFFPS.json b/configurations/IBM_1400W_CFFPS.json
similarity index 100%
rename from configurations/IBM 1400W CFFPS.json
rename to configurations/IBM_1400W_CFFPS.json
diff --git a/configurations/IBM 1600W CFFPS.json b/configurations/IBM_1600W_CFFPS.json
similarity index 100%
rename from configurations/IBM 1600W CFFPS.json
rename to configurations/IBM_1600W_CFFPS.json
diff --git a/configurations/IBM 2000W CFFPS.json b/configurations/IBM_2000W_CFFPS.json
similarity index 100%
rename from configurations/IBM 2000W CFFPS.json
rename to configurations/IBM_2000W_CFFPS.json
diff --git a/configurations/IBM 2300W CFFPS.json b/configurations/IBM_2300W_CFFPS.json
similarity index 100%
rename from configurations/IBM 2300W CFFPS.json
rename to configurations/IBM_2300W_CFFPS.json
diff --git a/configurations/Intel Front Panel.json b/configurations/Intel_Front_Panel.json
similarity index 100%
rename from configurations/Intel Front Panel.json
rename to configurations/Intel_Front_Panel.json
diff --git a/configurations/NVME P4000.json b/configurations/NVME_P4000.json
similarity index 100%
rename from configurations/NVME P4000.json
rename to configurations/NVME_P4000.json
diff --git a/configurations/PCIE SSD Retimer.json b/configurations/PCIE_SSD_Retimer.json
similarity index 100%
rename from configurations/PCIE SSD Retimer.json
rename to configurations/PCIE_SSD_Retimer.json
diff --git a/configurations/R1000 Chassis.json b/configurations/R1000_Chassis.json
similarity index 100%
rename from configurations/R1000 Chassis.json
rename to configurations/R1000_Chassis.json
diff --git a/configurations/R2000 Chassis.json b/configurations/R2000_Chassis.json
similarity index 100%
rename from configurations/R2000 Chassis.json
rename to configurations/R2000_Chassis.json
diff --git a/configurations/Rainier 1S4U Chassis.json b/configurations/Rainier_1S4U_Chassis.json
similarity index 100%
rename from configurations/Rainier 1S4U Chassis.json
rename to configurations/Rainier_1S4U_Chassis.json
diff --git a/configurations/Rainier 2U Chassis.json b/configurations/Rainier_2U_Chassis.json
similarity index 100%
rename from configurations/Rainier 2U Chassis.json
rename to configurations/Rainier_2U_Chassis.json
diff --git a/configurations/Rainier 4U Chassis.json b/configurations/Rainier_4U_Chassis.json
similarity index 100%
rename from configurations/Rainier 4U Chassis.json
rename to configurations/Rainier_4U_Chassis.json
diff --git a/configurations/SAS Module.json b/configurations/SAS_Module.json
similarity index 100%
rename from configurations/SAS Module.json
rename to configurations/SAS_Module.json
diff --git a/configurations/STP Baseboard.json b/configurations/STP_Baseboard.json
similarity index 100%
rename from configurations/STP Baseboard.json
rename to configurations/STP_Baseboard.json
diff --git a/configurations/STP P4000 Chassis.json b/configurations/STP_P4000_Chassis.json
similarity index 100%
rename from configurations/STP P4000 Chassis.json
rename to configurations/STP_P4000_Chassis.json
diff --git a/configurations/Storm King.json b/configurations/Storm_King.json
similarity index 100%
rename from configurations/Storm King.json
rename to configurations/Storm_King.json
diff --git a/configurations/WFT Baseboard.json b/configurations/WFT_Baseboard.json
similarity index 100%
rename from configurations/WFT Baseboard.json
rename to configurations/WFT_Baseboard.json
diff --git a/meson.build b/meson.build
index aeb6445..5858dc2 100644
--- a/meson.build
+++ b/meson.build
@@ -71,9 +71,9 @@
 install_data('blacklist.json')
 
 configs = [
-    '1Ux16 Riser.json',
-    '2Ux8 Riser.json',
-    '8X25 HSBP.json',
+    '1Ux16_Riser.json',
+    '2Ux8_Riser.json',
+    '8X25_HSBP.json',
     'A2UL16RISER.json',
     'A2UX8X4RISER.json',
     'ACBELL_RICA_PSU.json',
@@ -90,49 +90,49 @@
     'ASPOWER_U1D-D10800_PSU.json',
     'AXX1P100HSSI_AIC.json',
     'AXX2PRTHDHD.json',
-    'BNP Baseboard.json',
+    'BNP_Baseboard.json',
     'Bellavista.json',
     'Delta_AWF2DC3200W_PSU.json',
-    'Delta DPS-750XB PSU.json',
+    'Delta_DPS-750XB_PSU.json',
     'Delta_DPS-1600AB_PSU.json',
     'Delta_DPS-2000AB_PSU.json',
     'Everest.json',
-    'F1U12X25 HSBP.json',
-    'F1U4X25 HSBP.json',
-    'F2U12X35 HSBP.json',
-    'F2U8X25 HSBP.json',
+    'F1U12X25_HSBP.json',
+    'F1U4X25_HSBP.json',
+    'F2U12X35_HSBP.json',
+    'F2U8X25_HSBP.json',
     'FBTP.json',
     'FBYV2.json',
-    'Flextronics S-1100ADU00-201 PSU.json',
-    'IBM 1000W CFFPS.json',
-    'IBM 1400W CFFPS.json',
-    'IBM 1600W CFFPS.json',
-    'IBM 2000W CFFPS.json',
-    'IBM 2300W CFFPS.json',
-    'Intel Front Panel.json',
+    'Flextronics_S-1100ADU00-201_PSU.json',
+    'IBM_1000W_CFFPS.json',
+    'IBM_1400W_CFFPS.json',
+    'IBM_1600W_CFFPS.json',
+    'IBM_2000W_CFFPS.json',
+    'IBM_2300W_CFFPS.json',
+    'Intel_Front_Panel.json',
     'Kudo_BMC.json',
     'Kudo_Motherboard.json',
     'Mt_Jade.json',
     'Nisqually.json',
-    'NVME P4000.json',
-    'PCIE SSD Retimer.json',
+    'NVME_P4000.json',
+    'PCIE_SSD_Retimer.json',
     'PSSF132202A.json',
     'PSSF162205A.json',
     'PSSF212201A.json',
     'PSSF222201A.json',
-    'Rainier 2U Chassis.json',
-    'Rainier 4U Chassis.json',
-    'Rainier 1S4U Chassis.json',
-    'R1000 Chassis.json',
-    'R2000 Chassis.json',
-    'SAS Module.json',
+    'Rainier_2U_Chassis.json',
+    'Rainier_4U_Chassis.json',
+    'Rainier_1S4U_Chassis.json',
+    'R1000_Chassis.json',
+    'R2000_Chassis.json',
+    'SAS_Module.json',
     'SOLUM_PSSF162202_PSU.json',
-    'Storm King.json',
-    'STP Baseboard.json',
-    'STP P4000 Chassis.json',
+    'Storm_King.json',
+    'STP_Baseboard.json',
+    'STP_P4000_Chassis.json',
     'Tyan_S7106_Baseboard.json',
     'Tyan_S8036_Baseboard.json',
-    'WFT Baseboard.json',
+    'WFT_Baseboard.json',
 ]
 filepaths = []
 foreach c : configs