diff --git a/systems.nix b/systems.nix
index 2ae61c5..4b33336 100644
--- a/systems.nix
+++ b/systems.nix
@@ -41,8 +41,8 @@ let
     };
 in
 {
-  pi400 = mkSystem "aarch64-unknown-linux-gnu" "pi400";
-  pi4 = mkSystem "aarch64-unknown-linux-gnu" "pi4";
-  pi5 = mkSystem "aarch64-unknown-linux-gnu" "pi5";
-  pi4_2 = mkSystem "aarch64-unknown-linux-gnu" "pi4_2";
+  club-mate = mkSystem "aarch64-unknown-linux-gnu" "club-mate";
+  mio-mio-mate = mkSystem "aarch64-unknown-linux-gnu" "mio-mio-mate";
+  fritz-mate = mkSystem "aarch64-unknown-linux-gnu" "fritz-mate";
+  flora-mate = mkSystem "aarch64-unknown-linux-gnu" "flora-mate";
 }
diff --git a/systems/pi400/default.nix b/systems/club-mate/default.nix
similarity index 100%
rename from systems/pi400/default.nix
rename to systems/club-mate/default.nix
diff --git a/systems/pi4_2/default.nix b/systems/flora-mate/default.nix
similarity index 100%
rename from systems/pi4_2/default.nix
rename to systems/flora-mate/default.nix
diff --git a/systems/pi5/default.nix b/systems/fritz-mate/default.nix
similarity index 100%
rename from systems/pi5/default.nix
rename to systems/fritz-mate/default.nix
diff --git a/systems/pi4/default.nix b/systems/mio-mio-mate/default.nix
similarity index 100%
rename from systems/pi4/default.nix
rename to systems/mio-mio-mate/default.nix