diff --git a/modules/functionality/ensure.nix b/modules/functionality/ensure.nix
index 278bc7b..d874bd7 100644
--- a/modules/functionality/ensure.nix
+++ b/modules/functionality/ensure.nix
@@ -7,7 +7,7 @@ in
 {
   options.services.ensure = with types; {
     enable = mkBoolOpt true;
-    directories = mkOpt (listOf string) [ ];
+    directories = mkOpt (listOf str) [ ];
   };
 
   config.systemd.services = {
diff --git a/modules/functionality/ssh-tunnel.nix b/modules/functionality/ssh-tunnel.nix
index ae06043..8016f82 100644
--- a/modules/functionality/ssh-tunnel.nix
+++ b/modules/functionality/ssh-tunnel.nix
@@ -8,13 +8,13 @@ in
     enable = mkEnableOption "SSH tunneling service";
 
     server = mkOption {
-      type = with types; uniq string;
+      type = with types; uniq str;
       default = null;
       description = "The SSH server to connect for port forwarding";
     };
 
     requiredBy = mkOption {
-      type = with types; listOf string;
+      type = with types; listOf str;
       default = [ ];
       description = "List of systemd services that require the SSH tunnels";
     };
@@ -23,17 +23,17 @@ in
       type = types.submodule {
         options = {
           dynamic = mkOption {
-            type = with types; listOf (either port string);
+            type = with types; listOf (either port str);
             default = [ ];
             description = "List of dynamic ports to open through the ssh tunnel. See ssh(1) for ``-D``";
           };
           local = mkOption {
-            type = with types; listOf (either port string);
+            type = with types; listOf (either port str);
             default = [ ];
             description = "List of local ports to open through the ssh tunnel. See ssh(1) for ``-L``";
           };
           remote = mkOption {
-            type = with types; listOf (either port string);
+            type = with types; listOf (either port str);
             default = [ ];
             description = "List of remote ports to open through the ssh tunnel. See ssh(1) for ``-R``";
           };