diff --git a/routlin/core.py b/routlin/core.py
index 3489010..9e6596f 100644
--- a/routlin/core.py
+++ b/routlin/core.py
@@ -32,7 +32,7 @@ File layout:
     dnsmasq-routlin-<name>.service          -- per-VLAN dnsmasq service unit
     routlin-dns-blocklist-update.timer      -- daily blocklist refresh timer
     routlin-dns-blocklist-update.service    -- timer service unit
-    core-nat.service                        -- boot service to re-apply nftables rules
+    routlin-nat.service                     -- boot service to re-apply nftables rules
 
   /var/lib/misc/
     dnsmasq-routlin-<name>.leases           -- per-VLAN DHCP lease files
@@ -131,7 +131,7 @@ DASHB_LAST_RUN_FILE   = SCRIPT_DIR / ".dashboard-last-run"
 DASHB_LOCK_FILE       = SCRIPT_DIR / ".dashboard-lock"
 DASHB_SCRIPT_FILE     = SCRIPT_DIR / "do_dashboard_queue.sh"
 RESOLV_CONF       = Path("/etc/resolv.conf")
-NAT_SERVICE_NAME  = "core-nat"
+NAT_SERVICE_NAME  = f"{PRODUCT_NAME}-nat"
 NAT_SERVICE_FILE  = SYSTEMD_DIR / f"{NAT_SERVICE_NAME}.service"
 WG_DIR            = Path("/etc/wireguard")
 WG_KEEPALIVE      = 25
@@ -2867,6 +2867,7 @@ def _dry_run_disable(data, iface, use_dhcp, static_cidr, resolv_ok, dns_choice,
 def cmd_disable(data, dry_run=False):
     """Interactive wizard to revert the machine from router to plain network client."""
     import readline
+    data = resolve_vlan_derived_fields(data)
 
     print()
     print("=" * 70)