diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go
index 8025cf0f0..c5c7593e5 100644
--- a/builder/amazon/common/run_config.go
+++ b/builder/amazon/common/run_config.go
@@ -23,7 +23,7 @@ type RunConfig struct {
 	SubnetId             string `mapstructure:"subnet_id"`
 	TemporaryKeyPairName string `mapstructure:"temporary_key_pair_name"`
 	VpcId                string `mapstructure:"vpc_id"`
-	AvailZone            string `mapstructure:"avail_zone"`
+	AvailabilityZone     string `mapstructure:"availability_zone"`
 
 	// Unexported fields that are calculated from others
 	sshTimeout time.Duration
@@ -84,7 +84,7 @@ func (c *RunConfig) Prepare(t *packer.ConfigTemplate) []error {
 		"subnet_id":               &c.SubnetId,
 		"temporary_key_pair_name": &c.TemporaryKeyPairName,
 		"vpc_id":                  &c.VpcId,
-		"avail_zone":              &c.AvailZone,
+		"availability_zone":       &c.AvailabilityZone,
 	}
 
 	for n, ptr := range templates {
diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go
index 5d26f8c69..00b7e2d97 100644
--- a/builder/amazon/common/step_run_source_instance.go
+++ b/builder/amazon/common/step_run_source_instance.go
@@ -18,7 +18,7 @@ type StepRunSourceInstance struct {
 	SourceAMI          string
 	IamInstanceProfile string
 	SubnetId           string
-	AvailZone          string
+	AvailabilityZone   string
 	BlockDevices       BlockDevices
 
 	instance *ec2.Instance
@@ -52,7 +52,7 @@ func (s *StepRunSourceInstance) Run(state multistep.StateBag) multistep.StepActi
 		IamInstanceProfile: s.IamInstanceProfile,
 		SubnetId:           s.SubnetId,
 		BlockDevices:       s.BlockDevices.BuildLaunchDevices(),
-		AvailZone:          s.AvailZone,
+		AvailZone:          s.AvailabilityZone,
 	}
 
 	ui.Say("Launching a source AWS instance...")
diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go
index f646d694f..d315bc92f 100644
--- a/builder/amazon/ebs/builder.go
+++ b/builder/amazon/ebs/builder.go
@@ -101,7 +101,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			SourceAMI:          b.config.SourceAmi,
 			IamInstanceProfile: b.config.IamInstanceProfile,
 			SubnetId:           b.config.SubnetId,
-			AvailZone:          b.config.AvailZone,
+			AvailabilityZone:   b.config.AvailabilityZone,
 			BlockDevices:       b.config.BlockDevices,
 		},
 		&common.StepConnectSSH{