diff --git a/config.yaml b/config.yaml
index 10e853dd..05d366cd 100644
--- a/config.yaml
+++ b/config.yaml
@@ -235,7 +235,7 @@ options:
       192.168.0.0/24)
       .
       This network will be used for public endpoints.
-  endpoint-public-name:
+  os-public-hostname:
     type: string
     default:
     description: |
@@ -243,7 +243,7 @@ options:
       in the keystone identity provider.
       .
       This value will be used for public endpoints. For example, an
-      endpoint-public-name set to 'neutron-api.example.com' with ssl enabled
+      os-public-hostname set to 'neutron-api.example.com' with ssl enabled
       will create the following endpoint for neutron-api:
       .
       https://neutron-api.example.com:9696/
diff --git a/hooks/charmhelpers/contrib/openstack/ip.py b/hooks/charmhelpers/contrib/openstack/ip.py
index 45531b57..6e18c98a 100644
--- a/hooks/charmhelpers/contrib/openstack/ip.py
+++ b/hooks/charmhelpers/contrib/openstack/ip.py
@@ -34,17 +34,17 @@ ADDRESS_MAP = {
     PUBLIC: {
         'config': 'os-public-network',
         'fallback': 'public-address',
-        'override': 'endpoint-public-name',
+        'override': 'os-public-hostname',
     },
     INTERNAL: {
         'config': 'os-internal-network',
         'fallback': 'private-address',
-        'override': 'endpoint-internal-name',
+        'override': 'os-internal-hostname',
     },
     ADMIN: {
         'config': 'os-admin-network',
         'fallback': 'private-address',
-        'override': 'endpoint-admin-name',
+        'override': 'os-admin-hostname',
     }
 }
 
diff --git a/unit_tests/test_neutron_api_hooks.py b/unit_tests/test_neutron_api_hooks.py
index 92913fe9..ff909fbb 100644
--- a/unit_tests/test_neutron_api_hooks.py
+++ b/unit_tests/test_neutron_api_hooks.py
@@ -347,7 +347,7 @@ class NeutronAPIHooksTests(CharmTestCase):
         _config.side_effect = self.test_config.get
         self.api_port.return_value = '9696'
         self.test_config.set('region', 'region1')
-        self.test_config.set('endpoint-public-name',
+        self.test_config.set('os-public-hostname',
                              'neutron-api.example.com')
         self._call_hook('identity-service-relation-joined')
         _neutron_url = 'http://127.0.0.1:9696'