diff --git a/litex_boards/platforms/icebreaker.py b/litex_boards/platforms/1bitsquared_icebreaker.py
similarity index 100%
rename from litex_boards/platforms/icebreaker.py
rename to litex_boards/platforms/1bitsquared_icebreaker.py
diff --git a/litex_boards/platforms/__init__.py b/litex_boards/platforms/__init__.py
index e51437d..0c2ce4b 100644
--- a/litex_boards/platforms/__init__.py
+++ b/litex_boards/platforms/__init__.py
@@ -6,17 +6,26 @@ import importlib
 # Boards Vendors.
 
 vendors = [
+    "1bitsquared",
     "colorlight",
     "digilent",
     "enclustra",
+    "gsd",
+    "hackaday"
     "kosagi",
     "lattice",
+    "lambdaconcept",
     "linsn",
     "numato",
     "qmtech",
+    "radiona",
+    "rhsresearchllc",
+    "saanlima",
+    "scarabhardware",
+    "siglent",
+    "sqrl",
     "terasic",
     "trenz",
-    "sqrl",
     "xilinx",
 ]
 
diff --git a/litex_boards/platforms/orangecrab.py b/litex_boards/platforms/gsd_orangecrab.py
similarity index 100%
rename from litex_boards/platforms/orangecrab.py
rename to litex_boards/platforms/gsd_orangecrab.py
diff --git a/litex_boards/platforms/hadbadge.py b/litex_boards/platforms/hackaday_hadbadge.py
similarity index 100%
rename from litex_boards/platforms/hadbadge.py
rename to litex_boards/platforms/hackaday_hadbadge.py
diff --git a/litex_boards/platforms/ecpix5.py b/litex_boards/platforms/lambdaconcept_ecpix5.py
similarity index 100%
rename from litex_boards/platforms/ecpix5.py
rename to litex_boards/platforms/lambdaconcept_ecpix5.py
diff --git a/litex_boards/platforms/ulx3s.py b/litex_boards/platforms/radiona_ulx3s.py
similarity index 100%
rename from litex_boards/platforms/ulx3s.py
rename to litex_boards/platforms/radiona_ulx3s.py
diff --git a/litex_boards/platforms/litefury.py b/litex_boards/platforms/rhsresearchllc_litefury.py
similarity index 100%
rename from litex_boards/platforms/litefury.py
rename to litex_boards/platforms/rhsresearchllc_litefury.py
diff --git a/litex_boards/platforms/pipistrello.py b/litex_boards/platforms/saanlima_pipistrello.py
similarity index 100%
rename from litex_boards/platforms/pipistrello.py
rename to litex_boards/platforms/saanlima_pipistrello.py
diff --git a/litex_boards/platforms/minispartan6.py b/litex_boards/platforms/scarabhardware_minispartan6.py
similarity index 100%
rename from litex_boards/platforms/minispartan6.py
rename to litex_boards/platforms/scarabhardware_minispartan6.py
diff --git a/litex_boards/platforms/sds1104xe.py b/litex_boards/platforms/siglent_sds1104xe.py
similarity index 100%
rename from litex_boards/platforms/sds1104xe.py
rename to litex_boards/platforms/siglent_sds1104xe.py
diff --git a/litex_boards/targets/icebreaker.py b/litex_boards/targets/1bitsquared_icebreaker.py
similarity index 100%
rename from litex_boards/targets/icebreaker.py
rename to litex_boards/targets/1bitsquared_icebreaker.py
diff --git a/litex_boards/targets/__init__.py b/litex_boards/targets/__init__.py
index f27f1b2..7df3249 100644
--- a/litex_boards/targets/__init__.py
+++ b/litex_boards/targets/__init__.py
@@ -6,17 +6,26 @@ import importlib
 # Boards Vendors.
 
 vendors = [
+    "1bitsquared",
     "colorlight",
     "digilent",
     "enclustra",
+    "gsd",
+    "hackaday"
     "kosagi",
     "lattice",
+    "lambdaconcept",
     "linsn",
     "numato",
     "qmtech",
+    "radiona",
+    "rhsresearchllc",
+    "saanlima",
+    "scarabhardware",
+    "siglent",
+    "sqrl",
     "terasic",
     "trenz",
-    "sqrl",
     "xilinx",
 ]
 
diff --git a/litex_boards/targets/orangecrab.py b/litex_boards/targets/gsd_orangecrab.py
similarity index 100%
rename from litex_boards/targets/orangecrab.py
rename to litex_boards/targets/gsd_orangecrab.py
diff --git a/litex_boards/targets/hadbadge.py b/litex_boards/targets/hackaday_hadbadge.py
similarity index 100%
rename from litex_boards/targets/hadbadge.py
rename to litex_boards/targets/hackaday_hadbadge.py
diff --git a/litex_boards/targets/ecpix5.py b/litex_boards/targets/lambdaconcept_ecpix5.py
similarity index 100%
rename from litex_boards/targets/ecpix5.py
rename to litex_boards/targets/lambdaconcept_ecpix5.py
diff --git a/litex_boards/targets/ulx3s.py b/litex_boards/targets/radiona_ulx3s.py
similarity index 100%
rename from litex_boards/targets/ulx3s.py
rename to litex_boards/targets/radiona_ulx3s.py
diff --git a/litex_boards/targets/litefury.py b/litex_boards/targets/rhsresearchllc_litefury.py
similarity index 100%
rename from litex_boards/targets/litefury.py
rename to litex_boards/targets/rhsresearchllc_litefury.py
diff --git a/litex_boards/targets/pipistrello.py b/litex_boards/targets/saanlima_pipistrello.py
similarity index 100%
rename from litex_boards/targets/pipistrello.py
rename to litex_boards/targets/saanlima_pipistrello.py
diff --git a/litex_boards/targets/minispartan6.py b/litex_boards/targets/scarabhardware_minispartan6.py
similarity index 100%
rename from litex_boards/targets/minispartan6.py
rename to litex_boards/targets/scarabhardware_minispartan6.py
diff --git a/litex_boards/targets/sds1104xe.py b/litex_boards/targets/siglent_sds1104xe.py
similarity index 100%
rename from litex_boards/targets/sds1104xe.py
rename to litex_boards/targets/siglent_sds1104xe.py