diff --git a/docs/networking/proxies/nginx.md b/docs/networking/proxies/nginx.md
index 5bf70c66bc3..61b531ba6b8 100644
--- a/docs/networking/proxies/nginx.md
+++ b/docs/networking/proxies/nginx.md
@@ -376,8 +376,8 @@ Unsetting this value is the same as enabling custom nginx config usage.
 {{ .PROXY_PORT }}                   Non-SSL nginx listener port (same as `DOKKU_PROXY_PORT` config var)
 {{ .PROXY_SSL_PORT }}               SSL nginx listener port (same as `DOKKU_PROXY_SSL_PORT` config var)
 {{ .NOSSL_SERVER_NAME }}            List of non-SSL VHOSTS
-{{ .PROXY_PORT_MAP }}               List of port mappings (same as the `port-map` ports property)
-{{ .PROXY_UPSTREAM_PORTS }}         List of configured upstream ports (derived from the `port-map` ports property)
+{{ .PROXY_PORT_MAP }}               List of port mappings (same as the `map` ports property)
+{{ .PROXY_UPSTREAM_PORTS }}         List of configured upstream ports (derived from the `map` ports property)
 {{ .RAW_TCP_PORTS }}                List of exposed tcp ports as defined by Dockerfile `EXPOSE` directive (**Dockerfile apps only**)
 {{ .SSL_INUSE }}                    Boolean set when an app is SSL-enabled
 {{ .SSL_SERVER_NAME }}              List of SSL VHOSTS
diff --git a/plugins/ports/functions.go b/plugins/ports/functions.go
index 64b8e9628f3..f13c049c4ef 100644
--- a/plugins/ports/functions.go
+++ b/plugins/ports/functions.go
@@ -23,7 +23,7 @@ func addPortMaps(appName string, portMaps []PortMap) error {
 }
 
 func clearPorts(appName string) error {
-	return common.PropertyDelete("ports", appName, "port-map")
+	return common.PropertyDelete("ports", appName, "map")
 }
 
 func doesCertExist(appName string) bool {
@@ -115,7 +115,7 @@ func getGlobalProxySSLPort() int {
 }
 
 func getPortMaps(appName string) []PortMap {
-	value, err := common.PropertyListGet("ports", appName, "port-map")
+	value, err := common.PropertyListGet("ports", appName, "map")
 	if err != nil {
 		return []PortMap{}
 	}
@@ -364,7 +364,7 @@ func removePortMaps(appName string, portMaps []PortMap) error {
 	}
 
 	if len(toSet) == 0 {
-		return common.PropertyDelete("ports", appName, "port-map")
+		return common.PropertyDelete("ports", appName, "map")
 	}
 
 	return setPortMaps(appName, toSet)
@@ -381,7 +381,7 @@ func setPortMaps(appName string, portMaps []PortMap) error {
 	}
 
 	sort.Strings(value)
-	return common.PropertyListWrite("ports", appName, "port-map", value)
+	return common.PropertyListWrite("ports", appName, "map", value)
 }
 
 func setProxyPort(appName string, port int) error {
diff --git a/plugins/ports/triggers.go b/plugins/ports/triggers.go
index e5a9af25758..53f01fb2bdd 100644
--- a/plugins/ports/triggers.go
+++ b/plugins/ports/triggers.go
@@ -19,11 +19,11 @@ func TriggerInstall() error {
 	}
 
 	for _, appName := range apps {
-		if common.PropertyExists("ports", appName, "port-map") {
+		if common.PropertyExists("ports", appName, "map") {
 			continue
 		}
 
-		common.LogInfo1(fmt.Sprintf("Migrating DOKKU_PROXY_PORT_MAP to port-map property for %s", appName))
+		common.LogInfo1(fmt.Sprintf("Migrating DOKKU_PROXY_PORT_MAP to ports map property for %s", appName))
 		portMapString := config.GetWithDefault(appName, "DOKKU_PROXY_PORT_MAP", "")
 		portMaps, _ := parsePortMapString(portMapString)
 
@@ -32,7 +32,7 @@ func TriggerInstall() error {
 			propertyValue = append(propertyValue, portMap.String())
 		}
 
-		if err := common.PropertyListWrite("ports", appName, "port-map", propertyValue); err != nil {
+		if err := common.PropertyListWrite("ports", appName, "map", propertyValue); err != nil {
 			return err
 		}