diff --git a/hosts/fern/default.nix b/hosts/fern/default.nix
index c8141d8..b2398bb 100644
--- a/hosts/fern/default.nix
+++ b/hosts/fern/default.nix
@@ -11,7 +11,7 @@
 
   myConfig = {
     boot = {
-      loader.systemd-boot.enable = true;
+      loader.systemdBoot.enable = true;
       silent = true;
     };
 
@@ -24,7 +24,7 @@
     sound.enable = true;
     virtualisation.enable = true;
     sops.enable = true;
-    auto-gc.enable = true;
+    garbageCollection.enable = true;
     geoclue.enable = true;
     tailscale = {
       enable = true;
diff --git a/hosts/north/default.nix b/hosts/north/default.nix
index 9396727..2250b6e 100644
--- a/hosts/north/default.nix
+++ b/hosts/north/default.nix
@@ -11,7 +11,7 @@
 
   myConfig = {
     boot = {
-      loader.systemd-boot.enable = true;
+      loader.systemdBoot.enable = true;
       silent = true;
     };
 
@@ -21,7 +21,7 @@
     sound.enable = true;
     virtualisation.enable = true;
     sops.enable = true;
-    auto-gc.enable = true;
+    garbageCollection.enable = true;
     geoclue.enable = true;
     tailscale = {
       enable = true;
diff --git a/hosts/stratus/default.nix b/hosts/stratus/default.nix
index bbb2b67..c11c71c 100644
--- a/hosts/stratus/default.nix
+++ b/hosts/stratus/default.nix
@@ -12,7 +12,7 @@
 
   myConfig = {
     sops.enable = true;
-    boot.loader.systemd-boot.enable = true;
+    boot.loader.systemdBoot.enable = true;
     tailscale = {
       enable = true;
       ssh.enable = true;
diff --git a/modules/home/deUtils/cliphist.nix b/modules/home/de-utils/cliphist.nix
similarity index 100%
rename from modules/home/deUtils/cliphist.nix
rename to modules/home/de-utils/cliphist.nix
diff --git a/modules/home/deUtils/gammastep.nix b/modules/home/de-utils/gammastep.nix
similarity index 100%
rename from modules/home/deUtils/gammastep.nix
rename to modules/home/de-utils/gammastep.nix
diff --git a/modules/home/deUtils/hypridle.nix b/modules/home/de-utils/hypridle.nix
similarity index 100%
rename from modules/home/deUtils/hypridle.nix
rename to modules/home/de-utils/hypridle.nix
diff --git a/modules/home/deUtils/hyprlock.nix b/modules/home/de-utils/hyprlock.nix
similarity index 100%
rename from modules/home/deUtils/hyprlock.nix
rename to modules/home/de-utils/hyprlock.nix
diff --git a/modules/home/deUtils/hyprpaper.nix b/modules/home/de-utils/hyprpaper.nix
similarity index 100%
rename from modules/home/deUtils/hyprpaper.nix
rename to modules/home/de-utils/hyprpaper.nix
diff --git a/modules/home/deUtils/rofi/config.rasi b/modules/home/de-utils/rofi/config.rasi
similarity index 100%
rename from modules/home/deUtils/rofi/config.rasi
rename to modules/home/de-utils/rofi/config.rasi
diff --git a/modules/home/deUtils/rofi/dark-theme.rasi b/modules/home/de-utils/rofi/dark-theme.rasi
similarity index 100%
rename from modules/home/deUtils/rofi/dark-theme.rasi
rename to modules/home/de-utils/rofi/dark-theme.rasi
diff --git a/modules/home/deUtils/rofi/default.nix b/modules/home/de-utils/rofi/default.nix
similarity index 100%
rename from modules/home/deUtils/rofi/default.nix
rename to modules/home/de-utils/rofi/default.nix
diff --git a/modules/home/deUtils/rofi/light-theme.rasi b/modules/home/de-utils/rofi/light-theme.rasi
similarity index 100%
rename from modules/home/deUtils/rofi/light-theme.rasi
rename to modules/home/de-utils/rofi/light-theme.rasi
diff --git a/modules/home/deUtils/waybar.nix b/modules/home/de-utils/waybar.nix
similarity index 100%
rename from modules/home/deUtils/waybar.nix
rename to modules/home/de-utils/waybar.nix
diff --git a/modules/home/deUtils/wluma.nix b/modules/home/de-utils/wluma.nix
similarity index 100%
rename from modules/home/deUtils/wluma.nix
rename to modules/home/de-utils/wluma.nix
diff --git a/modules/home/nextcloud-sync/default.nix b/modules/home/nextcloud-sync/default.nix
index 1ce0b65..48107d1 100644
--- a/modules/home/nextcloud-sync/default.nix
+++ b/modules/home/nextcloud-sync/default.nix
@@ -32,9 +32,9 @@ let
     }";
 in
 {
-  options.myConfig.nextcloud-sync.enable = lib.mkEnableOption "";
+  options.myConfig.nextcloudSync.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.myConfig.nextcloud-sync.enable {
+  config = lib.mkIf config.myConfig.nextcloudSync.enable {
     sops.secrets."nextcloud-password" = { };
 
     systemd.user = {
diff --git a/modules/system/auto-gc.nix b/modules/system/auto-gc.nix
index b06046b..6238990 100644
--- a/modules/system/auto-gc.nix
+++ b/modules/system/auto-gc.nix
@@ -1,8 +1,8 @@
 { config, lib, ... }:
 {
-  options.myConfig.auto-gc.enable = lib.mkEnableOption "";
+  options.myConfig.garbageCollection.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.myConfig.auto-gc.enable {
+  config = lib.mkIf config.myConfig.garbageCollection.enable {
     programs.nh = {
       enable = true;
       clean = {
diff --git a/modules/system/boot/loader.nix b/modules/system/boot/loader.nix
index b9f0b46..f294447 100644
--- a/modules/system/boot/loader.nix
+++ b/modules/system/boot/loader.nix
@@ -1,8 +1,8 @@
 { config, lib, ... }:
 {
-  options.myConfig.boot.loader.systemd-boot.enable = lib.mkEnableOption "";
+  options.myConfig.boot.loader.systemdBoot.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.myConfig.boot.loader.systemd-boot.enable {
+  config = lib.mkIf config.myConfig.boot.loader.systemdBoot.enable {
     boot = {
       tmp.cleanOnBoot = true;
       loader = {