diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/aws-cdk-redshift-cluster-database.assets.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/MultiAzRedshift.assets.json
similarity index 64%
rename from packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/aws-cdk-redshift-cluster-database.assets.json
rename to packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/MultiAzRedshift.assets.json
index 2ad3496831dfd..61f34060d78fd 100644
--- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/aws-cdk-redshift-cluster-database.assets.json
+++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/MultiAzRedshift.assets.json
@@ -1,15 +1,15 @@
 {
   "version": "36.0.0",
   "files": {
-    "72b490317d843a0b349a9606d3196494e09ee685325d9c419033f2f302bd9765": {
+    "c2c282abac04283268fcc5f53da2bb783597d916fc0cef560cd7826453d8f439": {
       "source": {
-        "path": "aws-cdk-redshift-cluster-database.template.json",
+        "path": "MultiAzRedshift.template.json",
         "packaging": "file"
       },
       "destinations": {
         "214794239830-us-east-1": {
           "bucketName": "cdk-hnb659fds-assets-214794239830-us-east-1",
-          "objectKey": "72b490317d843a0b349a9606d3196494e09ee685325d9c419033f2f302bd9765.json",
+          "objectKey": "c2c282abac04283268fcc5f53da2bb783597d916fc0cef560cd7826453d8f439.json",
           "region": "us-east-1",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::214794239830:role/cdk-hnb659fds-file-publishing-role-214794239830-us-east-1"
         }
diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/aws-cdk-redshift-cluster-database.template.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/MultiAzRedshift.template.json
similarity index 92%
rename from packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/aws-cdk-redshift-cluster-database.template.json
rename to packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/MultiAzRedshift.template.json
index 834bd6495cb93..a97b027ea5cf5 100644
--- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/aws-cdk-redshift-cluster-database.template.json
+++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/MultiAzRedshift.template.json
@@ -10,7 +10,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc"
+      "Value": "MultiAzRedshift/Vpc"
      }
     ]
    },
@@ -34,7 +34,7 @@
      },
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1"
+      "Value": "MultiAzRedshift/Vpc/PublicSubnet1"
      }
     ],
     "VpcId": {
@@ -50,7 +50,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1"
+      "Value": "MultiAzRedshift/Vpc/PublicSubnet1"
      }
     ],
     "VpcId": {
@@ -97,7 +97,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1"
+      "Value": "MultiAzRedshift/Vpc/PublicSubnet1"
      }
     ]
    },
@@ -119,7 +119,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1"
+      "Value": "MultiAzRedshift/Vpc/PublicSubnet1"
      }
     ]
    },
@@ -147,7 +147,7 @@
      },
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2"
+      "Value": "MultiAzRedshift/Vpc/PublicSubnet2"
      }
     ],
     "VpcId": {
@@ -163,7 +163,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2"
+      "Value": "MultiAzRedshift/Vpc/PublicSubnet2"
      }
     ],
     "VpcId": {
@@ -210,7 +210,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2"
+      "Value": "MultiAzRedshift/Vpc/PublicSubnet2"
      }
     ]
    },
@@ -232,7 +232,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2"
+      "Value": "MultiAzRedshift/Vpc/PublicSubnet2"
      }
     ]
    },
@@ -260,7 +260,7 @@
      },
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3"
+      "Value": "MultiAzRedshift/Vpc/PublicSubnet3"
      }
     ],
     "VpcId": {
@@ -276,7 +276,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3"
+      "Value": "MultiAzRedshift/Vpc/PublicSubnet3"
      }
     ],
     "VpcId": {
@@ -323,7 +323,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3"
+      "Value": "MultiAzRedshift/Vpc/PublicSubnet3"
      }
     ]
    },
@@ -345,7 +345,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3"
+      "Value": "MultiAzRedshift/Vpc/PublicSubnet3"
      }
     ]
    },
@@ -373,7 +373,7 @@
      },
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet1"
+      "Value": "MultiAzRedshift/Vpc/PrivateSubnet1"
      }
     ],
     "VpcId": {
@@ -389,7 +389,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet1"
+      "Value": "MultiAzRedshift/Vpc/PrivateSubnet1"
      }
     ],
     "VpcId": {
@@ -443,7 +443,7 @@
      },
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet2"
+      "Value": "MultiAzRedshift/Vpc/PrivateSubnet2"
      }
     ],
     "VpcId": {
@@ -459,7 +459,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet2"
+      "Value": "MultiAzRedshift/Vpc/PrivateSubnet2"
      }
     ],
     "VpcId": {
@@ -513,7 +513,7 @@
      },
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet3"
+      "Value": "MultiAzRedshift/Vpc/PrivateSubnet3"
      }
     ],
     "VpcId": {
@@ -529,7 +529,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet3"
+      "Value": "MultiAzRedshift/Vpc/PrivateSubnet3"
      }
     ],
     "VpcId": {
@@ -572,7 +572,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "aws-cdk-redshift-cluster-database/Vpc"
+      "Value": "MultiAzRedshift/Vpc"
      }
     ]
    },
diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/awscdkredshiftmultiazDefaultTestDeployAssert27E37E1B.assets.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/MultiAzRedshiftTestDefaultTestDeployAssert07040285.assets.json
similarity index 87%
rename from packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/awscdkredshiftmultiazDefaultTestDeployAssert27E37E1B.assets.json
rename to packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/MultiAzRedshiftTestDefaultTestDeployAssert07040285.assets.json
index d338dc103b6a6..68598a246c0ad 100644
--- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/awscdkredshiftmultiazDefaultTestDeployAssert27E37E1B.assets.json
+++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/MultiAzRedshiftTestDefaultTestDeployAssert07040285.assets.json
@@ -3,7 +3,7 @@
   "files": {
     "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
       "source": {
-        "path": "awscdkredshiftmultiazDefaultTestDeployAssert27E37E1B.template.json",
+        "path": "MultiAzRedshiftTestDefaultTestDeployAssert07040285.template.json",
         "packaging": "file"
       },
       "destinations": {
diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/awscdkredshiftmultiazDefaultTestDeployAssert27E37E1B.template.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/MultiAzRedshiftTestDefaultTestDeployAssert07040285.template.json
similarity index 100%
rename from packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/awscdkredshiftmultiazDefaultTestDeployAssert27E37E1B.template.json
rename to packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/MultiAzRedshiftTestDefaultTestDeployAssert07040285.template.json
diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/integ.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/integ.json
index f302134300721..5929fc517ac89 100644
--- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/integ.json
+++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/integ.json
@@ -1,12 +1,12 @@
 {
   "version": "36.0.0",
   "testCases": {
-    "aws-cdk-redshift-multi-az/DefaultTest": {
+    "MultiAzRedshiftTest/DefaultTest": {
       "stacks": [
-        "aws-cdk-redshift-cluster-database"
+        "MultiAzRedshift"
       ],
-      "assertionStack": "aws-cdk-redshift-multi-az/DefaultTest/DeployAssert",
-      "assertionStackName": "awscdkredshiftmultiazDefaultTestDeployAssert27E37E1B"
+      "assertionStack": "MultiAzRedshiftTest/DefaultTest/DeployAssert",
+      "assertionStackName": "MultiAzRedshiftTestDefaultTestDeployAssert07040285"
     }
   }
 }
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/manifest.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/manifest.json
index 07ae36365eba6..a6035dfc94893 100644
--- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/manifest.json
+++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/manifest.json
@@ -1,28 +1,28 @@
 {
   "version": "36.0.0",
   "artifacts": {
-    "aws-cdk-redshift-cluster-database.assets": {
+    "MultiAzRedshift.assets": {
       "type": "cdk:asset-manifest",
       "properties": {
-        "file": "aws-cdk-redshift-cluster-database.assets.json",
+        "file": "MultiAzRedshift.assets.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
       }
     },
-    "aws-cdk-redshift-cluster-database": {
+    "MultiAzRedshift": {
       "type": "aws:cloudformation:stack",
       "environment": "aws://214794239830/us-east-1",
       "properties": {
-        "templateFile": "aws-cdk-redshift-cluster-database.template.json",
+        "templateFile": "MultiAzRedshift.template.json",
         "terminationProtection": false,
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::214794239830:role/cdk-hnb659fds-deploy-role-214794239830-us-east-1",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::214794239830:role/cdk-hnb659fds-cfn-exec-role-214794239830-us-east-1",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-214794239830-us-east-1/72b490317d843a0b349a9606d3196494e09ee685325d9c419033f2f302bd9765.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-214794239830-us-east-1/c2c282abac04283268fcc5f53da2bb783597d916fc0cef560cd7826453d8f439.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
-          "aws-cdk-redshift-cluster-database.assets"
+          "MultiAzRedshift.assets"
         ],
         "lookupRole": {
           "arn": "arn:${AWS::Partition}:iam::214794239830:role/cdk-hnb659fds-lookup-role-214794239830-us-east-1",
@@ -31,265 +31,265 @@
         }
       },
       "dependencies": [
-        "aws-cdk-redshift-cluster-database.assets"
+        "MultiAzRedshift.assets"
       ],
       "metadata": {
-        "/aws-cdk-redshift-cluster-database/Vpc/Resource": [
+        "/MultiAzRedshift/Vpc/Resource": [
           {
             "type": "aws:cdk:logicalId",
             "data": "Vpc8378EB38"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1/Subnet": [
+        "/MultiAzRedshift/Vpc/PublicSubnet1/Subnet": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet1Subnet5C2D37C4"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1/RouteTable": [
+        "/MultiAzRedshift/Vpc/PublicSubnet1/RouteTable": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet1RouteTable6C95E38E"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1/RouteTableAssociation": [
+        "/MultiAzRedshift/Vpc/PublicSubnet1/RouteTableAssociation": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet1RouteTableAssociation97140677"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1/DefaultRoute": [
+        "/MultiAzRedshift/Vpc/PublicSubnet1/DefaultRoute": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet1DefaultRoute3DA9E72A"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1/EIP": [
+        "/MultiAzRedshift/Vpc/PublicSubnet1/EIP": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet1EIPD7E02669"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1/NATGateway": [
+        "/MultiAzRedshift/Vpc/PublicSubnet1/NATGateway": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet1NATGateway4D7517AA"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2/Subnet": [
+        "/MultiAzRedshift/Vpc/PublicSubnet2/Subnet": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet2Subnet691E08A3"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2/RouteTable": [
+        "/MultiAzRedshift/Vpc/PublicSubnet2/RouteTable": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet2RouteTable94F7E489"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2/RouteTableAssociation": [
+        "/MultiAzRedshift/Vpc/PublicSubnet2/RouteTableAssociation": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet2RouteTableAssociationDD5762D8"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2/DefaultRoute": [
+        "/MultiAzRedshift/Vpc/PublicSubnet2/DefaultRoute": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet2DefaultRoute97F91067"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2/EIP": [
+        "/MultiAzRedshift/Vpc/PublicSubnet2/EIP": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet2EIP3C605A87"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2/NATGateway": [
+        "/MultiAzRedshift/Vpc/PublicSubnet2/NATGateway": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet2NATGateway9182C01D"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3/Subnet": [
+        "/MultiAzRedshift/Vpc/PublicSubnet3/Subnet": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet3SubnetBE12F0B6"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3/RouteTable": [
+        "/MultiAzRedshift/Vpc/PublicSubnet3/RouteTable": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet3RouteTable93458DBB"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3/RouteTableAssociation": [
+        "/MultiAzRedshift/Vpc/PublicSubnet3/RouteTableAssociation": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet3RouteTableAssociation1F1EDF02"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3/DefaultRoute": [
+        "/MultiAzRedshift/Vpc/PublicSubnet3/DefaultRoute": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet3DefaultRoute4697774F"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3/EIP": [
+        "/MultiAzRedshift/Vpc/PublicSubnet3/EIP": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet3EIP3A666A23"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3/NATGateway": [
+        "/MultiAzRedshift/Vpc/PublicSubnet3/NATGateway": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPublicSubnet3NATGateway7640CD1D"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet1/Subnet": [
+        "/MultiAzRedshift/Vpc/PrivateSubnet1/Subnet": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPrivateSubnet1Subnet536B997A"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet1/RouteTable": [
+        "/MultiAzRedshift/Vpc/PrivateSubnet1/RouteTable": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPrivateSubnet1RouteTableB2C5B500"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet1/RouteTableAssociation": [
+        "/MultiAzRedshift/Vpc/PrivateSubnet1/RouteTableAssociation": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPrivateSubnet1RouteTableAssociation70C59FA6"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet1/DefaultRoute": [
+        "/MultiAzRedshift/Vpc/PrivateSubnet1/DefaultRoute": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPrivateSubnet1DefaultRouteBE02A9ED"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet2/Subnet": [
+        "/MultiAzRedshift/Vpc/PrivateSubnet2/Subnet": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPrivateSubnet2Subnet3788AAA1"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet2/RouteTable": [
+        "/MultiAzRedshift/Vpc/PrivateSubnet2/RouteTable": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPrivateSubnet2RouteTableA678073B"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet2/RouteTableAssociation": [
+        "/MultiAzRedshift/Vpc/PrivateSubnet2/RouteTableAssociation": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPrivateSubnet2RouteTableAssociationA89CAD56"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet2/DefaultRoute": [
+        "/MultiAzRedshift/Vpc/PrivateSubnet2/DefaultRoute": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPrivateSubnet2DefaultRoute060D2087"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet3/Subnet": [
+        "/MultiAzRedshift/Vpc/PrivateSubnet3/Subnet": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPrivateSubnet3SubnetF258B56E"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet3/RouteTable": [
+        "/MultiAzRedshift/Vpc/PrivateSubnet3/RouteTable": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPrivateSubnet3RouteTableD98824C7"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet3/RouteTableAssociation": [
+        "/MultiAzRedshift/Vpc/PrivateSubnet3/RouteTableAssociation": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPrivateSubnet3RouteTableAssociation16BDDC43"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet3/DefaultRoute": [
+        "/MultiAzRedshift/Vpc/PrivateSubnet3/DefaultRoute": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcPrivateSubnet3DefaultRoute94B74F0D"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/IGW": [
+        "/MultiAzRedshift/Vpc/IGW": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcIGWD7BA715C"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Vpc/VPCGW": [
+        "/MultiAzRedshift/Vpc/VPCGW": [
           {
             "type": "aws:cdk:logicalId",
             "data": "VpcVPCGWBF912B6E"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Cluster/Subnets/Default": [
+        "/MultiAzRedshift/Cluster/Subnets/Default": [
           {
             "type": "aws:cdk:logicalId",
             "data": "ClusterSubnetsDCFA5CB7"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Cluster/SecurityGroup/Resource": [
+        "/MultiAzRedshift/Cluster/SecurityGroup/Resource": [
           {
             "type": "aws:cdk:logicalId",
             "data": "ClusterSecurityGroup0921994B"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Cluster/Secret/Resource": [
+        "/MultiAzRedshift/Cluster/Secret/Resource": [
           {
             "type": "aws:cdk:logicalId",
             "data": "ClusterSecret6368BD0F"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Cluster/Secret/Attachment/Resource": [
+        "/MultiAzRedshift/Cluster/Secret/Attachment/Resource": [
           {
             "type": "aws:cdk:logicalId",
             "data": "ClusterSecretAttachment769E6258"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/Cluster/Resource": [
+        "/MultiAzRedshift/Cluster/Resource": [
           {
             "type": "aws:cdk:logicalId",
             "data": "ClusterEB0386A7"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/BootstrapVersion": [
+        "/MultiAzRedshift/BootstrapVersion": [
           {
             "type": "aws:cdk:logicalId",
             "data": "BootstrapVersion"
           }
         ],
-        "/aws-cdk-redshift-cluster-database/CheckBootstrapVersion": [
+        "/MultiAzRedshift/CheckBootstrapVersion": [
           {
             "type": "aws:cdk:logicalId",
             "data": "CheckBootstrapVersion"
           }
         ]
       },
-      "displayName": "aws-cdk-redshift-cluster-database"
+      "displayName": "MultiAzRedshift"
     },
-    "awscdkredshiftmultiazDefaultTestDeployAssert27E37E1B.assets": {
+    "MultiAzRedshiftTestDefaultTestDeployAssert07040285.assets": {
       "type": "cdk:asset-manifest",
       "properties": {
-        "file": "awscdkredshiftmultiazDefaultTestDeployAssert27E37E1B.assets.json",
+        "file": "MultiAzRedshiftTestDefaultTestDeployAssert07040285.assets.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
       }
     },
-    "awscdkredshiftmultiazDefaultTestDeployAssert27E37E1B": {
+    "MultiAzRedshiftTestDefaultTestDeployAssert07040285": {
       "type": "aws:cloudformation:stack",
       "environment": "aws://unknown-account/unknown-region",
       "properties": {
-        "templateFile": "awscdkredshiftmultiazDefaultTestDeployAssert27E37E1B.template.json",
+        "templateFile": "MultiAzRedshiftTestDefaultTestDeployAssert07040285.template.json",
         "terminationProtection": false,
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
@@ -298,7 +298,7 @@
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
-          "awscdkredshiftmultiazDefaultTestDeployAssert27E37E1B.assets"
+          "MultiAzRedshiftTestDefaultTestDeployAssert07040285.assets"
         ],
         "lookupRole": {
           "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
@@ -307,23 +307,23 @@
         }
       },
       "dependencies": [
-        "awscdkredshiftmultiazDefaultTestDeployAssert27E37E1B.assets"
+        "MultiAzRedshiftTestDefaultTestDeployAssert07040285.assets"
       ],
       "metadata": {
-        "/aws-cdk-redshift-multi-az/DefaultTest/DeployAssert/BootstrapVersion": [
+        "/MultiAzRedshiftTest/DefaultTest/DeployAssert/BootstrapVersion": [
           {
             "type": "aws:cdk:logicalId",
             "data": "BootstrapVersion"
           }
         ],
-        "/aws-cdk-redshift-multi-az/DefaultTest/DeployAssert/CheckBootstrapVersion": [
+        "/MultiAzRedshiftTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [
           {
             "type": "aws:cdk:logicalId",
             "data": "CheckBootstrapVersion"
           }
         ]
       },
-      "displayName": "aws-cdk-redshift-multi-az/DefaultTest/DeployAssert"
+      "displayName": "MultiAzRedshiftTest/DefaultTest/DeployAssert"
     },
     "Tree": {
       "type": "cdk:tree",
diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/tree.json b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/tree.json
index 2c3555daf4c4f..e74c8975ff13d 100644
--- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/tree.json
+++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.js.snapshot/tree.json
@@ -4,17 +4,17 @@
     "id": "App",
     "path": "",
     "children": {
-      "aws-cdk-redshift-cluster-database": {
-        "id": "aws-cdk-redshift-cluster-database",
-        "path": "aws-cdk-redshift-cluster-database",
+      "MultiAzRedshift": {
+        "id": "MultiAzRedshift",
+        "path": "MultiAzRedshift",
         "children": {
           "Vpc": {
             "id": "Vpc",
-            "path": "aws-cdk-redshift-cluster-database/Vpc",
+            "path": "MultiAzRedshift/Vpc",
             "children": {
               "Resource": {
                 "id": "Resource",
-                "path": "aws-cdk-redshift-cluster-database/Vpc/Resource",
+                "path": "MultiAzRedshift/Vpc/Resource",
                 "attributes": {
                   "aws:cdk:cloudformation:type": "AWS::EC2::VPC",
                   "aws:cdk:cloudformation:props": {
@@ -25,7 +25,7 @@
                     "tags": [
                       {
                         "key": "Name",
-                        "value": "aws-cdk-redshift-cluster-database/Vpc"
+                        "value": "MultiAzRedshift/Vpc"
                       }
                     ]
                   }
@@ -37,11 +37,11 @@
               },
               "PublicSubnet1": {
                 "id": "PublicSubnet1",
-                "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1",
+                "path": "MultiAzRedshift/Vpc/PublicSubnet1",
                 "children": {
                   "Subnet": {
                     "id": "Subnet",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1/Subnet",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet1/Subnet",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::Subnet",
                       "aws:cdk:cloudformation:props": {
@@ -59,7 +59,7 @@
                           },
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1"
+                            "value": "MultiAzRedshift/Vpc/PublicSubnet1"
                           }
                         ],
                         "vpcId": {
@@ -74,7 +74,7 @@
                   },
                   "Acl": {
                     "id": "Acl",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1/Acl",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet1/Acl",
                     "constructInfo": {
                       "fqn": "aws-cdk-lib.Resource",
                       "version": "0.0.0"
@@ -82,14 +82,14 @@
                   },
                   "RouteTable": {
                     "id": "RouteTable",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1/RouteTable",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet1/RouteTable",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable",
                       "aws:cdk:cloudformation:props": {
                         "tags": [
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1"
+                            "value": "MultiAzRedshift/Vpc/PublicSubnet1"
                           }
                         ],
                         "vpcId": {
@@ -104,7 +104,7 @@
                   },
                   "RouteTableAssociation": {
                     "id": "RouteTableAssociation",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1/RouteTableAssociation",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet1/RouteTableAssociation",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation",
                       "aws:cdk:cloudformation:props": {
@@ -123,7 +123,7 @@
                   },
                   "DefaultRoute": {
                     "id": "DefaultRoute",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1/DefaultRoute",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet1/DefaultRoute",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::Route",
                       "aws:cdk:cloudformation:props": {
@@ -143,7 +143,7 @@
                   },
                   "EIP": {
                     "id": "EIP",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1/EIP",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet1/EIP",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::EIP",
                       "aws:cdk:cloudformation:props": {
@@ -151,7 +151,7 @@
                         "tags": [
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1"
+                            "value": "MultiAzRedshift/Vpc/PublicSubnet1"
                           }
                         ]
                       }
@@ -163,7 +163,7 @@
                   },
                   "NATGateway": {
                     "id": "NATGateway",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1/NATGateway",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet1/NATGateway",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway",
                       "aws:cdk:cloudformation:props": {
@@ -179,7 +179,7 @@
                         "tags": [
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet1"
+                            "value": "MultiAzRedshift/Vpc/PublicSubnet1"
                           }
                         ]
                       }
@@ -197,11 +197,11 @@
               },
               "PublicSubnet2": {
                 "id": "PublicSubnet2",
-                "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2",
+                "path": "MultiAzRedshift/Vpc/PublicSubnet2",
                 "children": {
                   "Subnet": {
                     "id": "Subnet",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2/Subnet",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet2/Subnet",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::Subnet",
                       "aws:cdk:cloudformation:props": {
@@ -219,7 +219,7 @@
                           },
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2"
+                            "value": "MultiAzRedshift/Vpc/PublicSubnet2"
                           }
                         ],
                         "vpcId": {
@@ -234,7 +234,7 @@
                   },
                   "Acl": {
                     "id": "Acl",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2/Acl",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet2/Acl",
                     "constructInfo": {
                       "fqn": "aws-cdk-lib.Resource",
                       "version": "0.0.0"
@@ -242,14 +242,14 @@
                   },
                   "RouteTable": {
                     "id": "RouteTable",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2/RouteTable",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet2/RouteTable",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable",
                       "aws:cdk:cloudformation:props": {
                         "tags": [
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2"
+                            "value": "MultiAzRedshift/Vpc/PublicSubnet2"
                           }
                         ],
                         "vpcId": {
@@ -264,7 +264,7 @@
                   },
                   "RouteTableAssociation": {
                     "id": "RouteTableAssociation",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2/RouteTableAssociation",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet2/RouteTableAssociation",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation",
                       "aws:cdk:cloudformation:props": {
@@ -283,7 +283,7 @@
                   },
                   "DefaultRoute": {
                     "id": "DefaultRoute",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2/DefaultRoute",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet2/DefaultRoute",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::Route",
                       "aws:cdk:cloudformation:props": {
@@ -303,7 +303,7 @@
                   },
                   "EIP": {
                     "id": "EIP",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2/EIP",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet2/EIP",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::EIP",
                       "aws:cdk:cloudformation:props": {
@@ -311,7 +311,7 @@
                         "tags": [
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2"
+                            "value": "MultiAzRedshift/Vpc/PublicSubnet2"
                           }
                         ]
                       }
@@ -323,7 +323,7 @@
                   },
                   "NATGateway": {
                     "id": "NATGateway",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2/NATGateway",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet2/NATGateway",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway",
                       "aws:cdk:cloudformation:props": {
@@ -339,7 +339,7 @@
                         "tags": [
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet2"
+                            "value": "MultiAzRedshift/Vpc/PublicSubnet2"
                           }
                         ]
                       }
@@ -357,11 +357,11 @@
               },
               "PublicSubnet3": {
                 "id": "PublicSubnet3",
-                "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3",
+                "path": "MultiAzRedshift/Vpc/PublicSubnet3",
                 "children": {
                   "Subnet": {
                     "id": "Subnet",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3/Subnet",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet3/Subnet",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::Subnet",
                       "aws:cdk:cloudformation:props": {
@@ -379,7 +379,7 @@
                           },
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3"
+                            "value": "MultiAzRedshift/Vpc/PublicSubnet3"
                           }
                         ],
                         "vpcId": {
@@ -394,7 +394,7 @@
                   },
                   "Acl": {
                     "id": "Acl",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3/Acl",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet3/Acl",
                     "constructInfo": {
                       "fqn": "aws-cdk-lib.Resource",
                       "version": "0.0.0"
@@ -402,14 +402,14 @@
                   },
                   "RouteTable": {
                     "id": "RouteTable",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3/RouteTable",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet3/RouteTable",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable",
                       "aws:cdk:cloudformation:props": {
                         "tags": [
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3"
+                            "value": "MultiAzRedshift/Vpc/PublicSubnet3"
                           }
                         ],
                         "vpcId": {
@@ -424,7 +424,7 @@
                   },
                   "RouteTableAssociation": {
                     "id": "RouteTableAssociation",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3/RouteTableAssociation",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet3/RouteTableAssociation",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation",
                       "aws:cdk:cloudformation:props": {
@@ -443,7 +443,7 @@
                   },
                   "DefaultRoute": {
                     "id": "DefaultRoute",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3/DefaultRoute",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet3/DefaultRoute",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::Route",
                       "aws:cdk:cloudformation:props": {
@@ -463,7 +463,7 @@
                   },
                   "EIP": {
                     "id": "EIP",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3/EIP",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet3/EIP",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::EIP",
                       "aws:cdk:cloudformation:props": {
@@ -471,7 +471,7 @@
                         "tags": [
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3"
+                            "value": "MultiAzRedshift/Vpc/PublicSubnet3"
                           }
                         ]
                       }
@@ -483,7 +483,7 @@
                   },
                   "NATGateway": {
                     "id": "NATGateway",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3/NATGateway",
+                    "path": "MultiAzRedshift/Vpc/PublicSubnet3/NATGateway",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway",
                       "aws:cdk:cloudformation:props": {
@@ -499,7 +499,7 @@
                         "tags": [
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PublicSubnet3"
+                            "value": "MultiAzRedshift/Vpc/PublicSubnet3"
                           }
                         ]
                       }
@@ -517,11 +517,11 @@
               },
               "PrivateSubnet1": {
                 "id": "PrivateSubnet1",
-                "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet1",
+                "path": "MultiAzRedshift/Vpc/PrivateSubnet1",
                 "children": {
                   "Subnet": {
                     "id": "Subnet",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet1/Subnet",
+                    "path": "MultiAzRedshift/Vpc/PrivateSubnet1/Subnet",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::Subnet",
                       "aws:cdk:cloudformation:props": {
@@ -539,7 +539,7 @@
                           },
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet1"
+                            "value": "MultiAzRedshift/Vpc/PrivateSubnet1"
                           }
                         ],
                         "vpcId": {
@@ -554,7 +554,7 @@
                   },
                   "Acl": {
                     "id": "Acl",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet1/Acl",
+                    "path": "MultiAzRedshift/Vpc/PrivateSubnet1/Acl",
                     "constructInfo": {
                       "fqn": "aws-cdk-lib.Resource",
                       "version": "0.0.0"
@@ -562,14 +562,14 @@
                   },
                   "RouteTable": {
                     "id": "RouteTable",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet1/RouteTable",
+                    "path": "MultiAzRedshift/Vpc/PrivateSubnet1/RouteTable",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable",
                       "aws:cdk:cloudformation:props": {
                         "tags": [
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet1"
+                            "value": "MultiAzRedshift/Vpc/PrivateSubnet1"
                           }
                         ],
                         "vpcId": {
@@ -584,7 +584,7 @@
                   },
                   "RouteTableAssociation": {
                     "id": "RouteTableAssociation",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet1/RouteTableAssociation",
+                    "path": "MultiAzRedshift/Vpc/PrivateSubnet1/RouteTableAssociation",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation",
                       "aws:cdk:cloudformation:props": {
@@ -603,7 +603,7 @@
                   },
                   "DefaultRoute": {
                     "id": "DefaultRoute",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet1/DefaultRoute",
+                    "path": "MultiAzRedshift/Vpc/PrivateSubnet1/DefaultRoute",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::Route",
                       "aws:cdk:cloudformation:props": {
@@ -629,11 +629,11 @@
               },
               "PrivateSubnet2": {
                 "id": "PrivateSubnet2",
-                "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet2",
+                "path": "MultiAzRedshift/Vpc/PrivateSubnet2",
                 "children": {
                   "Subnet": {
                     "id": "Subnet",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet2/Subnet",
+                    "path": "MultiAzRedshift/Vpc/PrivateSubnet2/Subnet",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::Subnet",
                       "aws:cdk:cloudformation:props": {
@@ -651,7 +651,7 @@
                           },
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet2"
+                            "value": "MultiAzRedshift/Vpc/PrivateSubnet2"
                           }
                         ],
                         "vpcId": {
@@ -666,7 +666,7 @@
                   },
                   "Acl": {
                     "id": "Acl",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet2/Acl",
+                    "path": "MultiAzRedshift/Vpc/PrivateSubnet2/Acl",
                     "constructInfo": {
                       "fqn": "aws-cdk-lib.Resource",
                       "version": "0.0.0"
@@ -674,14 +674,14 @@
                   },
                   "RouteTable": {
                     "id": "RouteTable",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet2/RouteTable",
+                    "path": "MultiAzRedshift/Vpc/PrivateSubnet2/RouteTable",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable",
                       "aws:cdk:cloudformation:props": {
                         "tags": [
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet2"
+                            "value": "MultiAzRedshift/Vpc/PrivateSubnet2"
                           }
                         ],
                         "vpcId": {
@@ -696,7 +696,7 @@
                   },
                   "RouteTableAssociation": {
                     "id": "RouteTableAssociation",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet2/RouteTableAssociation",
+                    "path": "MultiAzRedshift/Vpc/PrivateSubnet2/RouteTableAssociation",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation",
                       "aws:cdk:cloudformation:props": {
@@ -715,7 +715,7 @@
                   },
                   "DefaultRoute": {
                     "id": "DefaultRoute",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet2/DefaultRoute",
+                    "path": "MultiAzRedshift/Vpc/PrivateSubnet2/DefaultRoute",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::Route",
                       "aws:cdk:cloudformation:props": {
@@ -741,11 +741,11 @@
               },
               "PrivateSubnet3": {
                 "id": "PrivateSubnet3",
-                "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet3",
+                "path": "MultiAzRedshift/Vpc/PrivateSubnet3",
                 "children": {
                   "Subnet": {
                     "id": "Subnet",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet3/Subnet",
+                    "path": "MultiAzRedshift/Vpc/PrivateSubnet3/Subnet",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::Subnet",
                       "aws:cdk:cloudformation:props": {
@@ -763,7 +763,7 @@
                           },
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet3"
+                            "value": "MultiAzRedshift/Vpc/PrivateSubnet3"
                           }
                         ],
                         "vpcId": {
@@ -778,7 +778,7 @@
                   },
                   "Acl": {
                     "id": "Acl",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet3/Acl",
+                    "path": "MultiAzRedshift/Vpc/PrivateSubnet3/Acl",
                     "constructInfo": {
                       "fqn": "aws-cdk-lib.Resource",
                       "version": "0.0.0"
@@ -786,14 +786,14 @@
                   },
                   "RouteTable": {
                     "id": "RouteTable",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet3/RouteTable",
+                    "path": "MultiAzRedshift/Vpc/PrivateSubnet3/RouteTable",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable",
                       "aws:cdk:cloudformation:props": {
                         "tags": [
                           {
                             "key": "Name",
-                            "value": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet3"
+                            "value": "MultiAzRedshift/Vpc/PrivateSubnet3"
                           }
                         ],
                         "vpcId": {
@@ -808,7 +808,7 @@
                   },
                   "RouteTableAssociation": {
                     "id": "RouteTableAssociation",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet3/RouteTableAssociation",
+                    "path": "MultiAzRedshift/Vpc/PrivateSubnet3/RouteTableAssociation",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation",
                       "aws:cdk:cloudformation:props": {
@@ -827,7 +827,7 @@
                   },
                   "DefaultRoute": {
                     "id": "DefaultRoute",
-                    "path": "aws-cdk-redshift-cluster-database/Vpc/PrivateSubnet3/DefaultRoute",
+                    "path": "MultiAzRedshift/Vpc/PrivateSubnet3/DefaultRoute",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::Route",
                       "aws:cdk:cloudformation:props": {
@@ -853,14 +853,14 @@
               },
               "IGW": {
                 "id": "IGW",
-                "path": "aws-cdk-redshift-cluster-database/Vpc/IGW",
+                "path": "MultiAzRedshift/Vpc/IGW",
                 "attributes": {
                   "aws:cdk:cloudformation:type": "AWS::EC2::InternetGateway",
                   "aws:cdk:cloudformation:props": {
                     "tags": [
                       {
                         "key": "Name",
-                        "value": "aws-cdk-redshift-cluster-database/Vpc"
+                        "value": "MultiAzRedshift/Vpc"
                       }
                     ]
                   }
@@ -872,7 +872,7 @@
               },
               "VPCGW": {
                 "id": "VPCGW",
-                "path": "aws-cdk-redshift-cluster-database/Vpc/VPCGW",
+                "path": "MultiAzRedshift/Vpc/VPCGW",
                 "attributes": {
                   "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment",
                   "aws:cdk:cloudformation:props": {
@@ -897,15 +897,15 @@
           },
           "Cluster": {
             "id": "Cluster",
-            "path": "aws-cdk-redshift-cluster-database/Cluster",
+            "path": "MultiAzRedshift/Cluster",
             "children": {
               "Subnets": {
                 "id": "Subnets",
-                "path": "aws-cdk-redshift-cluster-database/Cluster/Subnets",
+                "path": "MultiAzRedshift/Cluster/Subnets",
                 "children": {
                   "Default": {
                     "id": "Default",
-                    "path": "aws-cdk-redshift-cluster-database/Cluster/Subnets/Default",
+                    "path": "MultiAzRedshift/Cluster/Subnets/Default",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::Redshift::ClusterSubnetGroup",
                       "aws:cdk:cloudformation:props": {
@@ -936,11 +936,11 @@
               },
               "SecurityGroup": {
                 "id": "SecurityGroup",
-                "path": "aws-cdk-redshift-cluster-database/Cluster/SecurityGroup",
+                "path": "MultiAzRedshift/Cluster/SecurityGroup",
                 "children": {
                   "Resource": {
                     "id": "Resource",
-                    "path": "aws-cdk-redshift-cluster-database/Cluster/SecurityGroup/Resource",
+                    "path": "MultiAzRedshift/Cluster/SecurityGroup/Resource",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup",
                       "aws:cdk:cloudformation:props": {
@@ -970,11 +970,11 @@
               },
               "Secret": {
                 "id": "Secret",
-                "path": "aws-cdk-redshift-cluster-database/Cluster/Secret",
+                "path": "MultiAzRedshift/Cluster/Secret",
                 "children": {
                   "Resource": {
                     "id": "Resource",
-                    "path": "aws-cdk-redshift-cluster-database/Cluster/Secret/Resource",
+                    "path": "MultiAzRedshift/Cluster/Secret/Resource",
                     "attributes": {
                       "aws:cdk:cloudformation:type": "AWS::SecretsManager::Secret",
                       "aws:cdk:cloudformation:props": {
@@ -993,11 +993,11 @@
                   },
                   "Attachment": {
                     "id": "Attachment",
-                    "path": "aws-cdk-redshift-cluster-database/Cluster/Secret/Attachment",
+                    "path": "MultiAzRedshift/Cluster/Secret/Attachment",
                     "children": {
                       "Resource": {
                         "id": "Resource",
-                        "path": "aws-cdk-redshift-cluster-database/Cluster/Secret/Attachment/Resource",
+                        "path": "MultiAzRedshift/Cluster/Secret/Attachment/Resource",
                         "attributes": {
                           "aws:cdk:cloudformation:type": "AWS::SecretsManager::SecretTargetAttachment",
                           "aws:cdk:cloudformation:props": {
@@ -1029,7 +1029,7 @@
               },
               "Resource": {
                 "id": "Resource",
-                "path": "aws-cdk-redshift-cluster-database/Cluster/Resource",
+                "path": "MultiAzRedshift/Cluster/Resource",
                 "attributes": {
                   "aws:cdk:cloudformation:type": "AWS::Redshift::Cluster",
                   "aws:cdk:cloudformation:props": {
@@ -1092,7 +1092,7 @@
           },
           "BootstrapVersion": {
             "id": "BootstrapVersion",
-            "path": "aws-cdk-redshift-cluster-database/BootstrapVersion",
+            "path": "MultiAzRedshift/BootstrapVersion",
             "constructInfo": {
               "fqn": "aws-cdk-lib.CfnParameter",
               "version": "0.0.0"
@@ -1100,7 +1100,7 @@
           },
           "CheckBootstrapVersion": {
             "id": "CheckBootstrapVersion",
-            "path": "aws-cdk-redshift-cluster-database/CheckBootstrapVersion",
+            "path": "MultiAzRedshift/CheckBootstrapVersion",
             "constructInfo": {
               "fqn": "aws-cdk-lib.CfnRule",
               "version": "0.0.0"
@@ -1112,17 +1112,17 @@
           "version": "0.0.0"
         }
       },
-      "aws-cdk-redshift-multi-az": {
-        "id": "aws-cdk-redshift-multi-az",
-        "path": "aws-cdk-redshift-multi-az",
+      "MultiAzRedshiftTest": {
+        "id": "MultiAzRedshiftTest",
+        "path": "MultiAzRedshiftTest",
         "children": {
           "DefaultTest": {
             "id": "DefaultTest",
-            "path": "aws-cdk-redshift-multi-az/DefaultTest",
+            "path": "MultiAzRedshiftTest/DefaultTest",
             "children": {
               "Default": {
                 "id": "Default",
-                "path": "aws-cdk-redshift-multi-az/DefaultTest/Default",
+                "path": "MultiAzRedshiftTest/DefaultTest/Default",
                 "constructInfo": {
                   "fqn": "constructs.Construct",
                   "version": "10.3.0"
@@ -1130,11 +1130,11 @@
               },
               "DeployAssert": {
                 "id": "DeployAssert",
-                "path": "aws-cdk-redshift-multi-az/DefaultTest/DeployAssert",
+                "path": "MultiAzRedshiftTest/DefaultTest/DeployAssert",
                 "children": {
                   "BootstrapVersion": {
                     "id": "BootstrapVersion",
-                    "path": "aws-cdk-redshift-multi-az/DefaultTest/DeployAssert/BootstrapVersion",
+                    "path": "MultiAzRedshiftTest/DefaultTest/DeployAssert/BootstrapVersion",
                     "constructInfo": {
                       "fqn": "aws-cdk-lib.CfnParameter",
                       "version": "0.0.0"
@@ -1142,7 +1142,7 @@
                   },
                   "CheckBootstrapVersion": {
                     "id": "CheckBootstrapVersion",
-                    "path": "aws-cdk-redshift-multi-az/DefaultTest/DeployAssert/CheckBootstrapVersion",
+                    "path": "MultiAzRedshiftTest/DefaultTest/DeployAssert/CheckBootstrapVersion",
                     "constructInfo": {
                       "fqn": "aws-cdk-lib.CfnRule",
                       "version": "0.0.0"
diff --git a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.ts b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.ts
index f6f5aad771bc1..be828068b6bec 100644
--- a/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.ts
+++ b/packages/@aws-cdk/aws-redshift-alpha/test/integ.cluster-multi-az.ts
@@ -9,7 +9,7 @@ const app = new cdk.App({
     'availability-zones:account=123456789012:region=us-east-1': ['us-east-1a', 'us-east-1b', 'us-east-1c'],
   },
 });
-const stack = new cdk.Stack(app, 'aws-cdk-redshift-cluster-database', {
+const stack = new cdk.Stack(app, 'MultiAzRedshift', {
   env: {
     account: '123456789012',
     region: 'us-east-1',
@@ -42,6 +42,6 @@ new redshift.Cluster(stack, 'Cluster', {
   multiAz: true,
 });
 
-new integ.IntegTest(app, 'aws-cdk-redshift-multi-az', {
+new integ.IntegTest(app, 'MultiAzRedshiftTest', {
   testCases: [stack],
 });