diff --git a/hosts/vali/mars/i3/i3-new.nix b/hosts/vali/mars/i3/i3-new.nix
index a720230..28bdab4 100644
--- a/hosts/vali/mars/i3/i3-new.nix
+++ b/hosts/vali/mars/i3/i3-new.nix
@@ -1,10 +1,10 @@
 {pkgs, lib, config, ... }:
 with lib; let
-  cfg = config.myOptions.programs.i3;
-  username = config.myOptions.other.system.username;
+  cfg = config.modules.programs.i3;
+  username = config.modules.other.system.username;
   mod = "Mod4";
 in {
-  options.myOptions.programs.i3.enable = mkEnableOption "i3";
+  options.modules.programs.i3.enable = mkEnableOption "i3";
 
   config = mkIf cfg.enable {
       services.xserver = {
diff --git a/hosts/vali/mars/i3/i3.nix b/hosts/vali/mars/i3/i3.nix
index a3242ee..9e16066 100644
--- a/hosts/vali/mars/i3/i3.nix
+++ b/hosts/vali/mars/i3/i3.nix
@@ -1,6 +1,6 @@
 { pkgs, lib, config, callPackage, ... }:
 with lib; let
-  username = config.myOptions.other.system.username;
+  username = config.modules.other.system.username;
   cfg = config.modules.programs.i3;
 in {
   options.modules.programs.i3.enable = mkEnableOption "i3";
diff --git a/modules/services/ssh.nix b/modules/services/ssh.nix
index 621a741..b44d94b 100644
--- a/modules/services/ssh.nix
+++ b/modules/services/ssh.nix
@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:
 with lib; let 
-    cfg = config.myOptions.programs.ssh;
-    username = config.myOptions.other.system.username;
+    cfg = config.modules.programs.ssh;
+    username = config.modules.other.system.username;
 in  {
-    options.myOptions.programs.ssh.enable = mkEnableOption "ssh";
+    options.modules.programs.ssh.enable = mkEnableOption "ssh";
 
     config = mkIf cfg.enable {
             programs.ssh = {
diff --git a/modules/tui/ncmpcpp.nix b/modules/tui/ncmpcpp.nix
index 2aaa6f7..2d69da8 100644
--- a/modules/tui/ncmpcpp.nix
+++ b/modules/tui/ncmpcpp.nix
@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:
 with lib; let
-    cfg = config.myOptions.programs.ncmpcpp;
-    username = config.myOptions.other.system.username;
+    cfg = config.modules.programs.ncmpcpp;
+    username = config.modules.other.system.username;
 in  {
-    options.myOptions.programs.ncmpcpp.enable = mkEnableOption "ncmpcpp";
+    options.modules.programs.ncmpcpp.enable = mkEnableOption "ncmpcpp";
 
     config = mkIf cfg.enable {
         home-manager.users.${username} = {