diff --git a/modules/nixos/nginx/listen.nix b/modules/nixos/nginx/listen.nix
index 4381a290..26625bc6 100644
--- a/modules/nixos/nginx/listen.nix
+++ b/modules/nixos/nginx/listen.nix
@@ -62,9 +62,6 @@
     in mapAttrs (_: mkAlmostOptionDefault) listenAttrs;
     mkListens = listen: map (mkListen listen) listen.addresses;
   in {
-    imports = [
-      (mkRenamedOptionModule [ "listenPorts" ] [ "listen'" ])
-    ];
     options = with lib.types; {
       listen' = mkOption {
         type = attrsOf (submoduleWith {
diff --git a/nixos/access/freepbx.nix b/nixos/access/freepbx.nix
index e32d580d..f337824d 100644
--- a/nixos/access/freepbx.nix
+++ b/nixos/access/freepbx.nix
@@ -10,7 +10,7 @@
   inherit (config.services) nginx;
   access = nginx.access.freepbx;
   freepbx = config.lib.access.systemFor "freepbx";
-  hasSsl = nginx.virtualHosts.freepbx'ucp.listenPorts.ucpSsl.enable;
+  hasSsl = nginx.virtualHosts.freepbx'ucp.listen'.ucpSsl.enable;
 in {
   options.services.nginx.access.freepbx = with lib.types; {
     host = mkOption {
@@ -80,7 +80,7 @@ in {
       freepbx'ucp = {
         serverName = mkDefault nginx.virtualHosts.freepbx.serverName;
         ssl.cert.copyFromVhost = "freepbx";
-        listenPorts = {
+        listen' = {
           ucp = {
             port = access.ucpPort;
             extraParameters = [ "default_server" ];
@@ -100,7 +100,7 @@ in {
         inherit extraConfig kTLS;
       };
       freepbx'local = {
-        listenPorts = {
+        listen' = {
           http = { };
           https.ssl = true;
           ucp = {
diff --git a/nixos/access/home-assistant.nix b/nixos/access/home-assistant.nix
index f303cb1c..d3d0be9f 100644
--- a/nixos/access/home-assistant.nix
+++ b/nixos/access/home-assistant.nix
@@ -6,7 +6,7 @@
   inherit (lib.modules) mkIf mkDefault;
   inherit (config.services) home-assistant nginx;
   name.shortServer = mkDefault "home";
-  listenPorts = {
+  listen' = {
     http = { };
     https.ssl = true;
     hass = {
@@ -30,7 +30,7 @@ in {
       };
     };
     home-assistant'local = {
-      inherit name listenPorts;
+      inherit name listen';
       ssl.cert.copyFromVhost = "home-assistant";
       local.enable = mkDefault true;
       locations."/" = {
diff --git a/nixos/access/kitchencam.nix b/nixos/access/kitchencam.nix
index c3de400f..9c1810ad 100644
--- a/nixos/access/kitchencam.nix
+++ b/nixos/access/kitchencam.nix
@@ -51,7 +51,7 @@ in {
           inherit extraConfig;
         };
       };
-      listenPorts = {
+      listen' = {
         http = { };
         https.ssl = true;
         stream.port = mkDefault access.streamPort;
@@ -60,11 +60,11 @@ in {
       kTLS = mkDefault true;
     in {
       kitchencam = {
-        inherit name locations listenPorts kTLS;
+        inherit name locations listen' kTLS;
         vouch.enable = true;
       };
       kitchencam'local = {
-        inherit name locations listenPorts kTLS;
+        inherit name locations listen' kTLS;
         ssl.cert.copyFromVhost = "kitchencam";
         local.enable = true;
       };
diff --git a/nixos/access/plex.nix b/nixos/access/plex.nix
index 16af3d7b..1ac57768 100644
--- a/nixos/access/plex.nix
+++ b/nixos/access/plex.nix
@@ -52,7 +52,7 @@ in {
     in {
       plex = {
         inherit name locations extraConfig kTLS;
-        listenPorts = {
+        listen' = {
           http = { };
           https.ssl = true;
           external = {
diff --git a/nixos/access/unifi.nix b/nixos/access/unifi.nix
index 3fe48b13..608c7e13 100644
--- a/nixos/access/unifi.nix
+++ b/nixos/access/unifi.nix
@@ -40,7 +40,7 @@ in {
       kTLS = mkDefault true;
     in {
       unifi'management = mkIf access.global.management {
-        listenPorts.management = {
+        listen'.management = {
           port = access.managementPort;
           ssl = true;
           extraParameters = [ "default_server" ];