diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
index f6063c0e4a..096ee55831 100644
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -185,19 +185,19 @@ resources:
   GlanceRegistryInternal:
     type: OS::TripleO::Endpoint
     properties:
-      EndpointName: GlanceInternal
+      EndpointName: GlanceRegistryInternal
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: GlanceRegistryVirtualIP}
   GlanceRegistryPublic:
     type: OS::TripleO::Endpoint
     properties:
-      EndpointName: GlancePublic
+      EndpointName: GlanceRegistryPublic
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: PublicVirtualIP}
   GlanceRegistryAdmin:
     type: OS::TripleO::Endpoint
     properties:
-      EndpointName: GlanceAdmin
+      EndpointName: GlanceRegistryAdmin
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: GlanceRegistryVirtualIP}
 
@@ -229,7 +229,7 @@ resources:
   HorizonPublic:
     type: OS::TripleO::Endpoint
     properties:
-      EndpointName: HeatPublic
+      EndpointName: HorizonPublic
       EndpointMap: { get_param: EndpointMap }
       IP: {get_param: PublicVirtualIP}
       CloudName: {get_param: CloudName}
@@ -481,4 +481,4 @@ outputs:
       SwiftS3Admin: {get_attr: [ SwiftS3Admin, endpoint] }
       SaharaInternal: {get_attr: [ SaharaInternal, endpoint] }
       SaharaPublic: {get_attr: [ SaharaPublic, endpoint] }
-      SaharaAdmin: {get_attr: [ SaharaAdmin, endpoint] }
\ No newline at end of file
+      SaharaAdmin: {get_attr: [ SaharaAdmin, endpoint] }