diff --git a/devices/gl-ar750/default.nix b/devices/gl-ar750/default.nix
index 5ee201b..b98d787 100644
--- a/devices/gl-ar750/default.nix
+++ b/devices/gl-ar750/default.nix
@@ -134,17 +134,17 @@
           # of it is device config, some of it is wifi config or
           # installation method config or ...
 
-          "CMDLINE_PARTITION" = "y";
-          "EARLY_PRINTK" = "y";
-          "FW_LOADER" = "y";
+          CMDLINE_PARTITION = "y";
+          EARLY_PRINTK = "y";
+          FW_LOADER = "y";
           # we don't have a user helper, so we get multiple 60s pauses
           # at boot time unless we disable trying to call it
-          "FW_LOADER_USER_HELPER" = "n";
+          FW_LOADER_USER_HELPER = "n";
 
-          "PARTITION_ADVANCED" = "y";
-          "PRINTK_TIME" = "y";
-          "SQUASHFS" = "y";
-          "SQUASHFS_XZ" = "y";
+          PARTITION_ADVANCED = "y";
+          PRINTK_TIME = "y";
+          SQUASHFS = "y";
+          SQUASHFS_XZ = "y";
         };
       };
     };
diff --git a/devices/gl-mt300a/default.nix b/devices/gl-mt300a/default.nix
index 7c368e6..0fef940 100644
--- a/devices/gl-mt300a/default.nix
+++ b/devices/gl-mt300a/default.nix
@@ -90,24 +90,19 @@
           MTD_CMDLINE_PARTS = "y";
           MTD_BLOCK = "y";         # fix undefined ref to register_mtd_blktrans_devs
 
-          CPU_LITTLE_ENDIAN= "y";
+          CPU_LITTLE_ENDIAN = "y";
 
-          # this is all copied from nixwrt ath79 config. Clearly not all
-          # of it is device config, some of it is wifi config or
-          # installation method config or ...
-
-          "CMDLINE_PARTITION" = "y";
-          "EARLY_PRINTK" = "y";
-          "FW_LOADER" = "y";
+          CMDLINE_PARTITION = "y";
+          EARLY_PRINTK = "y";
+          FW_LOADER = "y";
           # we don't have a user helper, so we get multiple 60s pauses
           # at boot time unless we disable trying to call it
-          "FW_LOADER_USER_HELPER" = "n";
+          FW_LOADER_USER_HELPER = "n";
 
-
-          "PARTITION_ADVANCED" = "y";
-          "PRINTK_TIME" = "y";
-          "SQUASHFS" = "y";
-          "SQUASHFS_XZ" = "y";
+          PARTITION_ADVANCED = "y";
+          PRINTK_TIME = "y";
+          SQUASHFS = "y";
+          SQUASHFS_XZ = "y";
         };
       };
     };
diff --git a/devices/gl-mt300n-v2/default.nix b/devices/gl-mt300n-v2/default.nix
index 0d68eae..642ec03 100644
--- a/devices/gl-mt300n-v2/default.nix
+++ b/devices/gl-mt300n-v2/default.nix
@@ -103,21 +103,17 @@
           GPIOLIB="y";
           GPIO_MT7621 = "y";
 
-          # this is all copied from nixwrt ath79 config. Clearly not all
-          # of it is device config, some of it is wifi config or
-          # installation method config or ...
-
-          "CMDLINE_PARTITION" = "y";
-          "EARLY_PRINTK" = "y";
-          "FW_LOADER" = "y";
+          CMDLINE_PARTITION = "y";
+          EARLY_PRINTK = "y";
+          FW_LOADER = "y";
           # we don't have a user helper, so we get multiple 60s pauses
           # at boot time unless we disable trying to call it
-          "FW_LOADER_USER_HELPER" = "n";
+          FW_LOADER_USER_HELPER = "n";
 
-          "PARTITION_ADVANCED" = "y";
-          "PRINTK_TIME" = "y";
-          "SQUASHFS" = "y";
-          "SQUASHFS_XZ" = "y";
+          PARTITION_ADVANCED = "y";
+          PRINTK_TIME = "y";
+          SQUASHFS = "y";
+          SQUASHFS_XZ = "y";
         };
       };
     };