diff --git a/models/README.md b/models/README.md
index 9178e61..80179b4 100644
--- a/models/README.md
+++ b/models/README.md
@@ -2,9 +2,9 @@
 
 ## Contents
 
-- [addp3](./addp3) - System76 Adder Pro (addp3)
 - [addw1](./addw1) - System76 Adder Workstation (addw1)
 - [addw2](./addw2) - System76 Adder WS (addw2)
+- [addw3](./addw3) - System76 Adder WS (addw3)
 - [bonw14](./bonw14) - System76 Bonobo WS (bonw14)
 - [darp5](./darp5) - System76 Darter Pro (darp5)
 - [darp6](./darp6) - System76 Darter Pro (darp6)
@@ -25,8 +25,7 @@
 - [gaze16-3060-b](./gaze16-3060-b) - System76 Gazelle (gaze16)
 - [gaze17-3050](./gaze17-3050) - System76 Gazelle (gaze17)
 - [gaze17-3060-b](./gaze17-3060-b) - System76 Gazelle (gaze17-3060-b)
-- [gaze18-3050](./gaze18-3050) - System76 Gazelle (gaze18-3050)
-- [gaze18-40x0](./gaze18-40x0) - System76 Gazelle (gaze18-40x0)
+- [gaze18](./gaze18) - System76 Gazelle (gaze18)
 - [lemp10](./lemp10) - System76 Lemur Pro (lemp10)
 - [lemp11](./lemp11) - System76 Lemur Pro (lemp11)
 - [lemp9](./lemp9) - System76 Lemur Pro (lemp9)
@@ -38,3 +37,4 @@
 - [oryp8](./oryp8) - System76 Oryx Pro (oryp8)
 - [oryp9](./oryp9) - System76 Oryx Pro (oryp9)
 - [qemu](./qemu) - QEMU (Virtualization)
+- [serw13](./serw13) - System76 Serval WS (serw13)
diff --git a/models/addw3/README.md b/models/addw3/README.md
index 6f3a574..146521f 100644
--- a/models/addw3/README.md
+++ b/models/addw3/README.md
@@ -1,4 +1,4 @@
-# System76 Gazelle (gaze18-40x0)
+# System76 Adder WS (addw3)
 
 ## Contents
 
diff --git a/models/addw3/README.md.in b/models/addw3/README.md.in
index 13463e2..db0d0b1 100644
--- a/models/addw3/README.md.in
+++ b/models/addw3/README.md.in
@@ -1 +1 @@
-# System76 Gazelle (gaze18-40x0)
+# System76 Adder WS (addw3)
diff --git a/models/addw3/coreboot.config b/models/addw3/coreboot.config
index 474e693..261daa2 100644
--- a/models/addw3/coreboot.config
+++ b/models/addw3/coreboot.config
@@ -1,5 +1,5 @@
 CONFIG_VENDOR_SYSTEM76=y
-CONFIG_BOARD_SYSTEM76_GAZE18_40X0=y
+CONFIG_BOARD_SYSTEM76_ADDW3=y
 CONFIG_CCACHE=y
 CONFIG_CONSOLE_SERIAL=n
 CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
diff --git a/models/addw3/ec.config b/models/addw3/ec.config
index 8413f10..4be240b 100644
--- a/models/addw3/ec.config
+++ b/models/addw3/ec.config
@@ -1 +1 @@
-BOARD=system76/gaze18-40x0
+BOARD=system76/addw3
diff --git a/models/gaze18/README.md b/models/gaze18/README.md
index 07bdf91..0179615 100644
--- a/models/gaze18/README.md
+++ b/models/gaze18/README.md
@@ -1,4 +1,4 @@
-# System76 Gazelle (gaze18-3050)
+# System76 Gazelle (gaze18)
 
 ## Contents
 
diff --git a/models/gaze18/README.md.in b/models/gaze18/README.md.in
index 048bb90..01c35e4 100644
--- a/models/gaze18/README.md.in
+++ b/models/gaze18/README.md.in
@@ -1 +1 @@
-# System76 Gazelle (gaze18-3050)
+# System76 Gazelle (gaze18)
diff --git a/models/gaze18/coreboot.config b/models/gaze18/coreboot.config
index 04f2f90..bc58545 100644
--- a/models/gaze18/coreboot.config
+++ b/models/gaze18/coreboot.config
@@ -1,5 +1,5 @@
 CONFIG_VENDOR_SYSTEM76=y
-CONFIG_BOARD_SYSTEM76_GAZE18_3050=y
+CONFIG_BOARD_SYSTEM76_GAZE18=y
 CONFIG_CCACHE=y
 CONFIG_CONSOLE_SERIAL=n
 CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
diff --git a/models/gaze18/ec.config b/models/gaze18/ec.config
new file mode 100644
index 0000000..13e1579
--- /dev/null
+++ b/models/gaze18/ec.config
@@ -0,0 +1 @@
+BOARD=system76/gaze18
diff --git a/models/oryp11/README.md b/models/oryp11/README.md
index 2d686f5..5fc579c 100644
--- a/models/oryp11/README.md
+++ b/models/oryp11/README.md
@@ -1,4 +1,4 @@
-# System76 Adder Pro (addp3)
+# System76 Oryx Pro (oryp11)
 
 ## Contents
 
@@ -9,4 +9,4 @@
   - HAP: false
 - [ME](./me.rom)
   - Size: 4824 KB
-  - Version: 16.1.25.2053
+  - Version: 16.1.25.2073
diff --git a/models/oryp11/README.md.in b/models/oryp11/README.md.in
index fdb57c7..ae241df 100644
--- a/models/oryp11/README.md.in
+++ b/models/oryp11/README.md.in
@@ -1 +1 @@
-# System76 Adder Pro (addp3)
+# System76 Oryx Pro (oryp11)
diff --git a/models/oryp11/coreboot.config b/models/oryp11/coreboot.config
index 357ae6b..68fb4f8 100644
--- a/models/oryp11/coreboot.config
+++ b/models/oryp11/coreboot.config
@@ -1,5 +1,5 @@
 CONFIG_VENDOR_SYSTEM76=y
-CONFIG_BOARD_SYSTEM76_ADDP3=y
+CONFIG_BOARD_SYSTEM76_ORYP11=y
 CONFIG_CCACHE=y
 CONFIG_CONSOLE_SERIAL=n
 CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
diff --git a/models/oryp11/ec.config b/models/oryp11/ec.config
index dcefce4..337bff4 100644
--- a/models/oryp11/ec.config
+++ b/models/oryp11/ec.config
@@ -1 +1 @@
-BOARD=system76/addp3
+BOARD=system76/oryp11
diff --git a/models/serw13/README.md b/models/serw13/README.md
index 7cbe934..792a5d8 100644
--- a/models/serw13/README.md
+++ b/models/serw13/README.md
@@ -1,4 +1,4 @@
-# System76 Oryx Pro (oryp11)
+# System76 Serval WS (serw13)
 
 ## Contents
 
diff --git a/models/serw13/README.md.in b/models/serw13/README.md.in
index ae241df..771729a 100644
--- a/models/serw13/README.md.in
+++ b/models/serw13/README.md.in
@@ -1 +1 @@
-# System76 Oryx Pro (oryp11)
+# System76 Serval WS (serw13)
diff --git a/models/serw13/coreboot.config b/models/serw13/coreboot.config
index fe682ae..f03e08d 100644
--- a/models/serw13/coreboot.config
+++ b/models/serw13/coreboot.config
@@ -1,5 +1,5 @@
 CONFIG_VENDOR_SYSTEM76=y
-CONFIG_BOARD_SYSTEM76_ORYP11=y
+CONFIG_BOARD_SYSTEM76_SERW13=y
 CONFIG_CCACHE=y
 CONFIG_CONSOLE_SERIAL=n
 CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
diff --git a/models/serw13/ec.config b/models/serw13/ec.config
index 337bff4..c6a86c2 100644
--- a/models/serw13/ec.config
+++ b/models/serw13/ec.config
@@ -1 +1 @@
-BOARD=system76/oryp11
+BOARD=system76/serw13