diff --git a/vpc-v2.cfndsl.rb b/vpc-v2.cfndsl.rb
index d5a9447..c8e046d 100644
--- a/vpc-v2.cfndsl.rb
+++ b/vpc-v2.cfndsl.rb
@@ -630,9 +630,9 @@
         NetworkAclId Ref("NetworkAcl#{cfg['type'].capitalize}")
       }
 
-      Output("#{cfg['name']}#{az}Subnet-AZ") {
+      Output("#{cfg['name']}#{az}SubnetAZ") {
         Value(FnGetAtt(subnet_name_az, :AvailabilityZone))
-        Export FnSub("${EnvironmentName}-#{external_parameters[:component_name]}-#{cfg['name']}Subnet#{az}-AZ")
+        Export FnSub("${EnvironmentName}-#{external_parameters[:component_name]}-#{cfg['name']}Subnet#{az}AZ")
       }
       
     end