diff --git a/Peering/.rpdk-config b/Peering/.rpdk-config
index d88e464..d95802c 100644
--- a/Peering/.rpdk-config
+++ b/Peering/.rpdk-config
@@ -1,10 +1,10 @@
 {
     "artifact_type": "RESOURCE",
-    "typeName": "Redis::CloudFormation::SubscriptionPeering",
+    "typeName": "Redis::Cloud::Peering",
     "language": "python311",
     "runtime": "python3.11",
-    "entrypoint": "redis_cloudformation_subscriptionpeering.handlers.resource",
-    "testEntrypoint": "redis_cloudformation_subscriptionpeering.handlers.test_entrypoint",
+    "entrypoint": "redis_cloud_peering.handlers.resource",
+    "testEntrypoint": "redis_cloud_peering.handlers.test_entrypoint",
     "settings": {
         "version": false,
         "subparser_name": null,
diff --git a/Peering/README.md b/Peering/README.md
index 60622a6..fd9f625 100644
--- a/Peering/README.md
+++ b/Peering/README.md
@@ -1,9 +1,9 @@
-# Redis::CloudFormation::SubscriptionPeering
+# Redis::Cloud::Peering
 
 Congratulations on starting development! Next steps:
 
 1. Write the JSON schema describing your resource, `redis-cloudformation-subscriptionpeering.json`
-2. Implement your resource handlers in `redis_cloudformation_subscriptionpeering/handlers.py`
+2. Implement your resource handlers in `redis_cloud_peering/handlers.py`
 
 > Don't modify `models.py` by hand, any modifications will be overwritten when the `generate` or `package` commands are run.
 
diff --git a/Peering/SubscriptionPeering.yml b/Peering/SubscriptionPeering.yml
index b0cad96..874eadd 100644
--- a/Peering/SubscriptionPeering.yml
+++ b/Peering/SubscriptionPeering.yml
@@ -1,7 +1,7 @@
 AWSTemplateFormatVersion: 2010-09-09
 Resources:
   SubscriptionPeering:
-    Type: Redis::CloudFormation::SubscriptionPeering
+    Type: Redis::Cloud::Peering
     Properties:
       SubscriptionID: !Ref SubscriptionID
       BaseUrl:        !Ref BaseUrl
diff --git a/Peering/docs/README.md b/Peering/docs/README.md
index ace17d5..a453eb0 100644
--- a/Peering/docs/README.md
+++ b/Peering/docs/README.md
@@ -1,4 +1,4 @@
-# Redis::CloudFormation::SubscriptionPeering
+# Redis::Cloud::Peering
 
 CloudFormation template for Subscription Peering.
 
@@ -10,7 +10,7 @@ To declare this entity in your AWS CloudFormation template, use the following sy
 
 <pre>
 {
-    "Type" : "Redis::CloudFormation::SubscriptionPeering",
+    "Type" : "Redis::Cloud::Peering",
     "Properties" : {
         "<a href="#baseurl" title="BaseUrl">BaseUrl</a>" : <i>String</i>,
         "<a href="#subscriptionid" title="SubscriptionID">SubscriptionID</a>" : <i>String</i>,
@@ -29,7 +29,7 @@ To declare this entity in your AWS CloudFormation template, use the following sy
 ### YAML
 
 <pre>
-Type: Redis::CloudFormation::SubscriptionPeering
+Type: Redis::Cloud::Peering
 Properties:
     <a href="#baseurl" title="BaseUrl">BaseUrl</a>: <i>String</i>
     <a href="#subscriptionid" title="SubscriptionID">SubscriptionID</a>: <i>String</i>
diff --git a/Peering/inputs/inputs_1_create.json b/Peering/inputs/inputs_1_create.json
index ce609d9..11871e5 100644
--- a/Peering/inputs/inputs_1_create.json
+++ b/Peering/inputs/inputs_1_create.json
@@ -1,6 +1,6 @@
 {
     "BaseUrl": "https://api-k8s-cloudapi.qa.redislabs.com",
-    "SubscriptionID": "187386",
+    "SubscriptionID": "187624",
     "Provider": "AWS",
     "Region": "eu-west-1",
     "AwsAccountId": "178919255282",
diff --git a/Peering/inputs/inputs_1_update.json b/Peering/inputs/inputs_1_update.json
index 88a4dbc..248c928 100644
--- a/Peering/inputs/inputs_1_update.json
+++ b/Peering/inputs/inputs_1_update.json
@@ -1,6 +1,6 @@
 {
     "BaseUrl": "https://api-k8s-cloudapi.qa.redislabs.com",
-    "SubscriptionID": "187386",
+    "SubscriptionID": "187624",
     "VpcCidrs": [
         "10.10.50.0/24",
         "10.10.60.0/24"
diff --git a/Peering/redis-cloudformation-subscriptionpeering-configuration.json b/Peering/redis-cloud-peering-configuration.json
similarity index 92%
rename from Peering/redis-cloudformation-subscriptionpeering-configuration.json
rename to Peering/redis-cloud-peering-configuration.json
index 52f7b08..32e4c9d 100644
--- a/Peering/redis-cloudformation-subscriptionpeering-configuration.json
+++ b/Peering/redis-cloud-peering-configuration.json
@@ -25,5 +25,5 @@
             "additionalProperties": false
         }
     },
-    "typeName": "Redis::CloudFormation::SubscriptionPeering"
+    "typeName": "Redis::Cloud::Peering"
 }
diff --git a/Peering/redis-cloudformation-subscriptionpeering.json b/Peering/redis-cloud-peering.json
similarity index 98%
rename from Peering/redis-cloudformation-subscriptionpeering.json
rename to Peering/redis-cloud-peering.json
index 8460259..5f830b7 100644
--- a/Peering/redis-cloudformation-subscriptionpeering.json
+++ b/Peering/redis-cloud-peering.json
@@ -1,5 +1,5 @@
 {
-    "typeName": "Redis::CloudFormation::SubscriptionPeering",
+    "typeName": "Redis::Cloud::Peering",
     "description": "CloudFormation template for Subscription Peering.",
     "tagging": {
       "taggable": false
diff --git a/Peering/resource-role.yaml b/Peering/resource-role.yaml
index c6e08a7..1e08ee1 100644
--- a/Peering/resource-role.yaml
+++ b/Peering/resource-role.yaml
@@ -21,7 +21,7 @@ Resources:
                   Ref: AWS::AccountId
               StringLike:
                 aws:SourceArn:
-                  Fn::Sub: arn:${AWS::Partition}:cloudformation:${AWS::Region}:${AWS::AccountId}:type/resource/Redis-CloudFormation-SubscriptionPeering/*
+                  Fn::Sub: arn:${AWS::Partition}:cloudformation:${AWS::Region}:${AWS::AccountId}:type/resource/Redis-Cloud-Peering/*
       Path: "/"
       Policies:
         - PolicyName: ResourceTypePolicy
diff --git a/Peering/src/redis_cloudformation_subscriptionpeering/__init__.py b/Peering/src/redis_cloud_peering/__init__.py
similarity index 100%
rename from Peering/src/redis_cloudformation_subscriptionpeering/__init__.py
rename to Peering/src/redis_cloud_peering/__init__.py
diff --git a/Peering/src/redis_cloudformation_subscriptionpeering/handlers.py b/Peering/src/redis_cloud_peering/handlers.py
similarity index 99%
rename from Peering/src/redis_cloudformation_subscriptionpeering/handlers.py
rename to Peering/src/redis_cloud_peering/handlers.py
index 3a33296..a286703 100644
--- a/Peering/src/redis_cloudformation_subscriptionpeering/handlers.py
+++ b/Peering/src/redis_cloud_peering/handlers.py
@@ -16,7 +16,7 @@
 
 # Use this logger to forward log messages to CloudWatch Logs. NON BREAKING CHANGE TO NOT TRIGGER WORKFLOW
 LOG = logging.getLogger(__name__)
-TYPE_NAME = "Redis::CloudFormation::SubscriptionPeering"
+TYPE_NAME = "Redis::Cloud::Peering"
 
 resource = Resource(TYPE_NAME, ResourceModel, TypeConfigurationModel)
 test_entrypoint = resource.test_entrypoint
diff --git a/Peering/src/redis_cloudformation_subscriptionpeering/models.py b/Peering/src/redis_cloud_peering/models.py
similarity index 100%
rename from Peering/src/redis_cloudformation_subscriptionpeering/models.py
rename to Peering/src/redis_cloud_peering/models.py
diff --git a/Peering/template.yml b/Peering/template.yml
index 1fc53ff..9a40960 100644
--- a/Peering/template.yml
+++ b/Peering/template.yml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: "2010-09-09"
 Transform: AWS::Serverless-2016-10-31
-Description: AWS SAM template for the Redis::CloudFormation::SubscriptionPeering resource type
+Description: AWS SAM template for the Redis::Cloud::Peering resource type
 
 Globals:
   Function:
@@ -11,14 +11,14 @@ Resources:
   TypeFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: redis_cloudformation_subscriptionpeering.handlers.resource
+      Handler: redis_cloud_peering.handlers.resource
       Runtime: python3.11
       CodeUri: build/
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: redis_cloudformation_subscriptionpeering.handlers.test_entrypoint
+      Handler: redis_cloud_peering.handlers.test_entrypoint
       Runtime: python3.11
       CodeUri: build/