diff --git a/haproxy_deployment/haproxy-deployment.yaml b/haproxy_deployment/haproxy-deployment.yaml
index cd50dfc7..78b57a10 100755
--- a/haproxy_deployment/haproxy-deployment.yaml
+++ b/haproxy_deployment/haproxy-deployment.yaml
@@ -72,7 +72,7 @@ resources:
     model: x/resources/haproxy_config/
     args:
       servers: {}
-      port: 5000
+      listen_port: 5000
       ports: {}
       ssh_user:
       ssh_key:
@@ -113,7 +113,7 @@ resources:
     model: x/resources/haproxy_config/
     args:
       servers: {}
-      port: 8774
+      listen_port: 8774
       ports: {}
       ssh_user:
       ssh_key:
@@ -185,13 +185,13 @@ connections:
   - emitter: haproxy_keystone_config
     receiver: haproxy-config
     mapping:
-      port: listen_ports
+      listen_port: listen_ports
       ports: configs_ports
       servers: configs
   - emitter: haproxy_nova_config
     receiver: haproxy-config
     mapping:
-      port: listen_ports
+      listen_port: listen_ports
       ports: configs_ports
       servers: configs
 
diff --git a/haproxy_deployment/haproxy_deployment.py b/haproxy_deployment/haproxy_deployment.py
index 21e32585..edf44cb9 100644
--- a/haproxy_deployment/haproxy_deployment.py
+++ b/haproxy_deployment/haproxy_deployment.py
@@ -89,8 +89,8 @@ class TestHAProxyDeployment(unittest.TestCase):
         self.assertDictEqual(
             haproxy_config.args['listen_ports'],
             {
-                'haproxy_keystone_config': haproxy_keystone_config.args['port'],
-                'haproxy_nova_config': haproxy_nova_config.args['port'],
+                'haproxy_keystone_config': haproxy_keystone_config.args['listen_port'],
+                'haproxy_nova_config': haproxy_nova_config.args['listen_port'],
             }
         )
         self.assertDictEqual(
diff --git a/x/resources/haproxy_config/meta.yaml b/x/resources/haproxy_config/meta.yaml
index 593d41f1..3ad9355f 100644
--- a/x/resources/haproxy_config/meta.yaml
+++ b/x/resources/haproxy_config/meta.yaml
@@ -2,7 +2,7 @@ id: haproxy_config
 handler: ansible
 version: 1.0.0
 input:
-    port:
+    listen_port:
     ports:
     servers:
 input-types: