diff --git a/device-types/Raspberry Pi/RPI-MODB.yaml b/device-types/Raspberry Pi/RPI-MODB.yaml
new file mode 100644
index 000000000..0e85549a3
--- /dev/null
+++ b/device-types/Raspberry Pi/RPI-MODB.yaml	
@@ -0,0 +1,13 @@
+---
+manufacturer: Raspberry Pi
+model: Raspberry Pi Model B
+slug: raspberry-pi-rpi-modb
+part_number: RPI-MODB
+u_height: 0
+is_full_depth: false
+interfaces:
+  - name: eth0
+    type: 100base-tx
+power-ports:
+  - name: PSU
+    type: usb-micro-b
diff --git a/device-types/Raspberry Pi/RPI-MODBP.yaml b/device-types/Raspberry Pi/RPI-MODBP.yaml
new file mode 100644
index 000000000..d5e48f2a5
--- /dev/null
+++ b/device-types/Raspberry Pi/RPI-MODBP.yaml	
@@ -0,0 +1,13 @@
+---
+manufacturer: Raspberry Pi
+model: Raspberry Pi Model B+
+slug: raspberry-pi-rpi-modbp
+part_number: RPI-MODBP
+u_height: 0
+is_full_depth: false
+interfaces:
+  - name: eth0
+    type: 100base-tx
+power-ports:
+  - name: PSU
+    type: usb-micro-b
diff --git a/device-types/Raspberry Pi/RPI2-MODB.yaml b/device-types/Raspberry Pi/RPI2-MODB.yaml
new file mode 100644
index 000000000..965d9d6f7
--- /dev/null
+++ b/device-types/Raspberry Pi/RPI2-MODB.yaml	
@@ -0,0 +1,13 @@
+---
+manufacturer: Raspberry Pi
+model: Raspberry Pi 2 Model B
+slug: raspberry-pi-rpi2-modb
+part_number: RPI2-MODB
+u_height: 0
+is_full_depth: false
+interfaces:
+  - name: eth0
+    type: 100base-tx
+power-ports:
+  - name: PSU
+    type: usb-micro-b
diff --git a/device-types/Raspberry Pi/RPI3-MODB-1GB.yaml b/device-types/Raspberry Pi/RPI3-MODB.yaml
similarity index 67%
rename from device-types/Raspberry Pi/RPI3-MODB-1GB.yaml
rename to device-types/Raspberry Pi/RPI3-MODB.yaml
index 455c1fac4..093a52ff9 100644
--- a/device-types/Raspberry Pi/RPI3-MODB-1GB.yaml	
+++ b/device-types/Raspberry Pi/RPI3-MODB.yaml	
@@ -1,8 +1,8 @@
 ---
 manufacturer: Raspberry Pi
-model: Raspberry Pi 3 Model B 1GB
-slug: raspberry-pi-rpi3-modb-1gb
-part_number: RPI3-MODB-1GB
+model: Raspberry Pi 3 Model B
+slug: raspberry-pi-rpi3-modb
+part_number: RPI3-MODB
 u_height: 0
 is_full_depth: false
 interfaces:
diff --git a/device-types/Raspberry Pi/RPI3-MODBP-1GB.yaml b/device-types/Raspberry Pi/RPI3-MODBP.yaml
similarity index 67%
rename from device-types/Raspberry Pi/RPI3-MODBP-1GB.yaml
rename to device-types/Raspberry Pi/RPI3-MODBP.yaml
index 38447cb53..2a8879724 100644
--- a/device-types/Raspberry Pi/RPI3-MODBP-1GB.yaml	
+++ b/device-types/Raspberry Pi/RPI3-MODBP.yaml	
@@ -1,8 +1,8 @@
 ---
 manufacturer: Raspberry Pi
-model: Raspberry Pi 3 Model B+ 1GB
-slug: raspberry-pi-rpi3-modbp-1gb
-part_number: RPI3-MODBP-1GB
+model: Raspberry Pi 3 Model B+
+slug: raspberry-pi-rpi3-modbp
+part_number: RPI3-MODBP
 u_height: 0
 is_full_depth: false
 interfaces:
diff --git a/device-types/Raspberry Pi/RPI4-MODB-4GB.yaml b/device-types/Raspberry Pi/RPI4-MOD400.yaml
similarity index 67%
rename from device-types/Raspberry Pi/RPI4-MODB-4GB.yaml
rename to device-types/Raspberry Pi/RPI4-MOD400.yaml
index 88a012036..68c51baf4 100644
--- a/device-types/Raspberry Pi/RPI4-MODB-4GB.yaml	
+++ b/device-types/Raspberry Pi/RPI4-MOD400.yaml	
@@ -1,8 +1,8 @@
 ---
 manufacturer: Raspberry Pi
-model: Raspberry Pi 4 Model B 4GB
-slug: raspberry-pi-rpi4-modb-4gb
-part_number: RPI4-MODB-4GB
+model: Raspberry Pi 4 Model 400
+slug: raspberry-pi-rpi4-mod400
+part_number: RPI4-MOD400
 u_height: 0
 is_full_depth: false
 interfaces:
diff --git a/device-types/Raspberry Pi/RPI4-MODB-2GB.yaml b/device-types/Raspberry Pi/RPI4-MODB-2GB.yaml
deleted file mode 100644
index a2ee51287..000000000
--- a/device-types/Raspberry Pi/RPI4-MODB-2GB.yaml	
+++ /dev/null
@@ -1,15 +0,0 @@
----
-manufacturer: Raspberry Pi
-model: Raspberry Pi 4 Model B 2GB
-slug: raspberry-pi-rpi4-modb-2gb
-part_number: RPI4-MODB-2GB
-u_height: 0
-is_full_depth: false
-interfaces:
-  - name: eth0
-    type: 1000base-t
-  - name: wlan0
-    type: ieee802.11ac
-power-ports:
-  - name: PSU
-    type: usb-c
diff --git a/device-types/Raspberry Pi/RPI4-MODB-8GB.yaml b/device-types/Raspberry Pi/RPI4-MODB.yaml
similarity index 67%
rename from device-types/Raspberry Pi/RPI4-MODB-8GB.yaml
rename to device-types/Raspberry Pi/RPI4-MODB.yaml
index b38f506f3..24f526690 100644
--- a/device-types/Raspberry Pi/RPI4-MODB-8GB.yaml	
+++ b/device-types/Raspberry Pi/RPI4-MODB.yaml	
@@ -1,8 +1,8 @@
 ---
 manufacturer: Raspberry Pi
-model: Raspberry Pi 4 Model B 8GB
-slug: raspberry-pi-rpi4-modb-8gb
-part_number: RPI4-MODB-8GB
+model: Raspberry Pi 4 Model B
+slug: raspberry-pi-rpi4-modb
+part_number: RPI4-MODB
 u_height: 0
 is_full_depth: false
 interfaces:
diff --git a/device-types/Raspberry Pi/RPI4-MODB-1GB.yaml b/device-types/Raspberry Pi/RPI5.yaml
similarity index 67%
rename from device-types/Raspberry Pi/RPI4-MODB-1GB.yaml
rename to device-types/Raspberry Pi/RPI5.yaml
index ee7789a6e..62c16a1c7 100644
--- a/device-types/Raspberry Pi/RPI4-MODB-1GB.yaml	
+++ b/device-types/Raspberry Pi/RPI5.yaml	
@@ -1,8 +1,8 @@
 ---
 manufacturer: Raspberry Pi
-model: Raspberry Pi 4 Model B 1GB
-slug: raspberry-pi-rpi4-modb-1gb
-part_number: RPI4-MODB-1GB
+model: Raspberry Pi 5
+slug: raspberry-pi-rpi5
+part_number: RPI5
 u_height: 0
 is_full_depth: false
 interfaces: