diff --git a/profiles/DerGeret/Arch/partition.nix b/profiles/DerGeret/Arch/config.nix
similarity index 55%
rename from profiles/DerGeret/Arch/partition.nix
rename to profiles/DerGeret/Arch/config.nix
index 3c02506c..29d74685 100644
--- a/profiles/DerGeret/Arch/partition.nix
+++ b/profiles/DerGeret/Arch/config.nix
@@ -1,6 +1,6 @@
 { ... }: {
   imports = [
     ../partition.nix
-    ../../../scripts/Arch/OS/partition.nix
+    ../../../scripts/Arch/OS/config.nix
   ];
 }
diff --git a/profiles/DerGeret/Arch/setup.sh b/profiles/DerGeret/Arch/setup.sh
index 33e8440c..716dbc23 100755
--- a/profiles/DerGeret/Arch/setup.sh
+++ b/profiles/DerGeret/Arch/setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
-PARTITION_MODULE="./partition.nix" \
+CONFIG_MODULE="./config.nix" \
 ARCH_HOSTNAME="der-geret" \
 USER_DISPLAYNAME="Manuel Thalmann" \
     . "../../../scripts/Arch/OS/setup.sh";
diff --git a/profiles/DerGeret/partition.nix b/profiles/DerGeret/config.nix
similarity index 100%
rename from profiles/DerGeret/partition.nix
rename to profiles/DerGeret/config.nix
diff --git a/profiles/ManuSurface/Arch/partition.nix b/profiles/ManuSurface/Arch/config.nix
similarity index 68%
rename from profiles/ManuSurface/Arch/partition.nix
rename to profiles/ManuSurface/Arch/config.nix
index 895b6aeb..b7018322 100644
--- a/profiles/ManuSurface/Arch/partition.nix
+++ b/profiles/ManuSurface/Arch/config.nix
@@ -1,6 +1,6 @@
 { ... }: {
   imports = [
-    ../../../scripts/Arch/OS/partition.nix
+    ../../../scripts/Arch/OS/config.nix
   ];
 
   config = {
diff --git a/profiles/ManuSurface/Arch/setup.sh b/profiles/ManuSurface/Arch/setup.sh
index 5e6129aa..a57fadd8 100755
--- a/profiles/ManuSurface/Arch/setup.sh
+++ b/profiles/ManuSurface/Arch/setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
-PARTITION_MODULE="./partition.nix" \
+CONFIG_MODULE="./config.nix" \
 ARCH_HOSTNAME="manu-surface" \
 USER_DISPLAYNAME="Manuel Thalmann" \
     . "../../../scripts/Arch/OS/setup.sh";
diff --git a/scripts/Arch/OS/partition.nix b/scripts/Arch/OS/config.nix
similarity index 100%
rename from scripts/Arch/OS/partition.nix
rename to scripts/Arch/OS/config.nix
diff --git a/scripts/Arch/OS/setup.sh b/scripts/Arch/OS/setup.sh
index 9fffd4c2..e6c7ef4c 100755
--- a/scripts/Arch/OS/setup.sh
+++ b/scripts/Arch/OS/setup.sh
@@ -1,11 +1,11 @@
 #!/bin/bash -e
-PARTITION_MODULE="${PARTITION_MODULE:+"$(realpath "$PARTITION_MODULE")"}";
+CONFIG_MODULE="${CONFIG_MODULE:+"$(realpath "$CONFIG_MODULE")"}";
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
-PARTITION_MODULE="${PARTITION_MODULE:-"./partition.nix"}";
+CONFIG_MODULE="${CONFIG_MODULE:-"./config.nix"}";
 ARCH_TIMEZONE="${ARCH_TIMEZONE:-"Europe/Zurich"}";
 ARCH_HOSTNAME="${ARCH_HOSTNAME}";
-ARCH_MOUNT_ROOT="${ARCH_MOUNT_ROOT:-"$(../../eval-module.sh "$PARTITION_MODULE" partition.rootDir --raw)"}";
+ARCH_MOUNT_ROOT="${ARCH_MOUNT_ROOT:-"$(../../eval-module.sh "$CONFIG_MODULE" partition.rootDir --raw)"}";
 ARCH_LANG="${ARCH_LANG:-"en_US.UTF-8"}";
 ARCH_KEYMAP="${ARCH_KEYMAP:-"de_CH-latin1"}";
 ARCH_X11_KEYMAP="${ARCH_X11_KEYMAP:-"ch"}";
diff --git a/scripts/Common/OS/partition.sh b/scripts/Common/OS/partition.sh
index 5dd19564..d6dc0423 100755
--- a/scripts/Common/OS/partition.sh
+++ b/scripts/Common/OS/partition.sh
@@ -1,3 +1,2 @@
 #!/bin/bash
-PARTITION_MODULE="${PARTITION_MODULE:-"./partition.nix"}";
-eval "$(../../eval-module.sh "$PARTITION_MODULE" partition.script --raw)";
+eval "$(../../eval-module.sh "$CONFIG_MODULE" partition.script --raw)";