diff --git a/aws/templates/single-gw/gateway-master.yaml b/aws/templates/single-gw/gateway-master.yaml
index f3574a0f..9983ad38 100755
--- a/aws/templates/single-gw/gateway-master.yaml
+++ b/aws/templates/single-gw/gateway-master.yaml
@@ -387,7 +387,7 @@ Conditions:
   AllocateAddress: !Equals [!Ref AllocatePublicAddress, true]
   ProvidedResourcesTag: !Not [!Equals [!Ref ResourcesTagName, '']]
 Resources:
-  Vpc:
+  VPCStack:
     Type: AWS::CloudFormation::Stack
     Properties:
       TemplateURL: https://cgi-cfts.s3.amazonaws.com/utils/vpc.yaml
@@ -402,7 +402,7 @@ Resources:
   InternalRoutingTable:
     Type: AWS::EC2::RouteTable
     Properties:
-      VpcId: !GetAtt Vpc.Outputs.VPCID
+      VpcId: !GetAtt VPCStack.Outputs.VPCID
       Tags:
         - Key: Name
           Value:
@@ -414,15 +414,15 @@ Resources:
     Type: AWS::EC2::SubnetRouteTableAssociation
     Properties:
       RouteTableId: !Ref InternalRoutingTable
-      SubnetId: !GetAtt Vpc.Outputs.PrivateSubnet1ID
+      SubnetId: !GetAtt VPCStack.Outputs.PrivateSubnet1ID
   GatewayStack:
     Type: AWS::CloudFormation::Stack
     Properties:
       TemplateURL: https://cgi-cfts.s3.amazonaws.com/gateway/gateway.yaml
       Parameters:
-        VPC: !GetAtt Vpc.Outputs.VPCID
-        PublicSubnet: !GetAtt Vpc.Outputs.PublicSubnet1ID
-        PrivateSubnet: !GetAtt Vpc.Outputs.PrivateSubnet1ID
+        VPC: !GetAtt VPCStack.Outputs.VPCID
+        PublicSubnet: !GetAtt VPCStack.Outputs.PublicSubnet1ID
+        PrivateSubnet: !GetAtt VPCStack.Outputs.PrivateSubnet1ID
         InternalRouteTable: !Ref InternalRoutingTable
         GatewayName: !Ref GatewayName
         GatewayInstanceType: !Ref GatewayInstanceType