diff --git a/environments/network-isolation-no-tunneling.yaml b/environments/network-isolation-no-tunneling.yaml
index ffdf2f7a4c..d90b49e1b9 100644
--- a/environments/network-isolation-no-tunneling.yaml
+++ b/environments/network-isolation-no-tunneling.yaml
@@ -45,12 +45,12 @@ resource_registry:
   #OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml
 
   # Port assignments for the swift storage role
-  OS::TripleO::SwiftStorage::Ports::ExternalPort: ../network/ports/noop.yaml
-  OS::TripleO::SwiftStorage::Ports::InternalApiPort: ../network/ports/internal_api.yaml
-  OS::TripleO::SwiftStorage::Ports::StoragePort: ../network/ports/storage.yaml
-  OS::TripleO::SwiftStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
-  OS::TripleO::SwiftStorage::Ports::TenantPort: ../network/ports/noop.yaml
-  #OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management.yaml
+  OS::TripleO::ObjectStorage::Ports::ExternalPort: ../network/ports/noop.yaml
+  OS::TripleO::ObjectStorage::Ports::InternalApiPort: ../network/ports/internal_api.yaml
+  OS::TripleO::ObjectStorage::Ports::StoragePort: ../network/ports/storage.yaml
+  OS::TripleO::ObjectStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
+  OS::TripleO::ObjectStorage::Ports::TenantPort: ../network/ports/noop.yaml
+  #OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management.yaml
 
   # Port assignments for the block storage role
   OS::TripleO::BlockStorage::Ports::ExternalPort: ../network/ports/noop.yaml
diff --git a/environments/network-isolation-v6.yaml b/environments/network-isolation-v6.yaml
index 11ca5b317f..c727419cd0 100644
--- a/environments/network-isolation-v6.yaml
+++ b/environments/network-isolation-v6.yaml
@@ -33,9 +33,9 @@ resource_registry:
   OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
 
   # Port assignments for the swift storage role
-  OS::TripleO::SwiftStorage::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml
-  OS::TripleO::SwiftStorage::Ports::StoragePort: ../network/ports/storage_v6.yaml
-  OS::TripleO::SwiftStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
+  OS::TripleO::ObjectStorage::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml
+  OS::TripleO::ObjectStorage::Ports::StoragePort: ../network/ports/storage_v6.yaml
+  OS::TripleO::ObjectStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
 
   # Port assignments for the block storage role
   OS::TripleO::BlockStorage::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml
diff --git a/environments/network-isolation.yaml b/environments/network-isolation.yaml
index a6b4b8aee6..601e7226ec 100644
--- a/environments/network-isolation.yaml
+++ b/environments/network-isolation.yaml
@@ -43,12 +43,12 @@ resource_registry:
   #OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml
 
   # Port assignments for the swift storage role
-  OS::TripleO::SwiftStorage::Ports::ExternalPort: ../network/ports/noop.yaml
-  OS::TripleO::SwiftStorage::Ports::InternalApiPort: ../network/ports/internal_api.yaml
-  OS::TripleO::SwiftStorage::Ports::StoragePort: ../network/ports/storage.yaml
-  OS::TripleO::SwiftStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
-  OS::TripleO::SwiftStorage::Ports::TenantPort: ../network/ports/noop.yaml
-  #OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management.yaml
+  OS::TripleO::ObjectStorage::Ports::ExternalPort: ../network/ports/noop.yaml
+  OS::TripleO::ObjectStorage::Ports::InternalApiPort: ../network/ports/internal_api.yaml
+  OS::TripleO::ObjectStorage::Ports::StoragePort: ../network/ports/storage.yaml
+  OS::TripleO::ObjectStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
+  OS::TripleO::ObjectStorage::Ports::TenantPort: ../network/ports/noop.yaml
+  #OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management.yaml
 
   # Port assignments for the block storage role
   OS::TripleO::BlockStorage::Ports::ExternalPort: ../network/ports/noop.yaml
diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml
index 2e3f527295..7cffbd4a75 100644
--- a/puppet/objectstorage-role.yaml
+++ b/puppet/objectstorage-role.yaml
@@ -179,42 +179,42 @@ resources:
     type: OS::TripleO::ObjectStorage::NodeUserData
 
   ExternalPort:
-    type: OS::TripleO::SwiftStorage::Ports::ExternalPort
+    type: OS::TripleO::ObjectStorage::Ports::ExternalPort
     properties:
       ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
       IPPool: {get_param: SwiftStorageIPs}
       NodeIndex: {get_param: NodeIndex}
 
   InternalApiPort:
-    type: OS::TripleO::SwiftStorage::Ports::InternalApiPort
+    type: OS::TripleO::ObjectStorage::Ports::InternalApiPort
     properties:
       ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
       IPPool: {get_param: SwiftStorageIPs}
       NodeIndex: {get_param: NodeIndex}
 
   StoragePort:
-    type: OS::TripleO::SwiftStorage::Ports::StoragePort
+    type: OS::TripleO::ObjectStorage::Ports::StoragePort
     properties:
       ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
       IPPool: {get_param: SwiftStorageIPs}
       NodeIndex: {get_param: NodeIndex}
 
   StorageMgmtPort:
-    type: OS::TripleO::SwiftStorage::Ports::StorageMgmtPort
+    type: OS::TripleO::ObjectStorage::Ports::StorageMgmtPort
     properties:
       ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
       IPPool: {get_param: SwiftStorageIPs}
       NodeIndex: {get_param: NodeIndex}
 
   TenantPort:
-    type: OS::TripleO::SwiftStorage::Ports::TenantPort
+    type: OS::TripleO::ObjectStorage::Ports::TenantPort
     properties:
       ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
       IPPool: {get_param: SwiftStorageIPs}
       NodeIndex: {get_param: NodeIndex}
 
   ManagementPort:
-    type: OS::TripleO::SwiftStorage::Ports::ManagementPort
+    type: OS::TripleO::ObjectStorage::Ports::ManagementPort
     properties:
       ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
       IPPool: {get_param: SwiftStorageIPs}