diff --git a/builder/amazon/common/step_modify_attributes.go b/builder/amazon/common/step_modify_ami_attributes.go
similarity index 85%
rename from builder/amazon/common/step_modify_attributes.go
rename to builder/amazon/common/step_modify_ami_attributes.go
index 94feaa482..55d2b2d1c 100644
--- a/builder/amazon/common/step_modify_attributes.go
+++ b/builder/amazon/common/step_modify_ami_attributes.go
@@ -7,14 +7,14 @@ import (
 	"github.com/mitchellh/packer/packer"
 )
 
-type StepModifyAttributes struct {
+type StepModifyAMIAttributes struct {
 	Users        []string
 	Groups       []string
 	ProductCodes []string
 	Description  string
 }
 
-func (s *StepModifyAttributes) Run(state map[string]interface{}) multistep.StepAction {
+func (s *StepModifyAMIAttributes) Run(state map[string]interface{}) multistep.StepAction {
 	ec2conn := state["ec2"].(*ec2.EC2)
 	ui := state["ui"].(packer.Ui)
 	amis := state["amis"].(map[string]string)
@@ -50,6 +50,6 @@ func (s *StepModifyAttributes) Run(state map[string]interface{}) multistep.StepA
 	return multistep.ActionContinue
 }
 
-func (s *StepModifyAttributes) Cleanup(state map[string]interface{}) {
+func (s *StepModifyAMIAttributes) Cleanup(state map[string]interface{}) {
 	// No cleanup...
 }
diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go
index 19fc3f721..018e9d1f1 100644
--- a/builder/amazon/ebs/builder.go
+++ b/builder/amazon/ebs/builder.go
@@ -126,7 +126,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&stepStopInstance{},
 		&stepCreateAMI{},
 		&awscommon.StepCreateTags{Tags: b.config.Tags},
-		&awscommon.StepModifyAttributes{
+		&awscommon.StepModifyAMIAttributes{
 			Description: b.config.AMIDescription,
 			Users:       b.config.AMIUsers,
 			Groups:      b.config.AMIGroups,
diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go
index d9b4ad51a..e3e4460c0 100644
--- a/builder/amazon/instance/builder.go
+++ b/builder/amazon/instance/builder.go
@@ -206,7 +206,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&StepUploadBundle{},
 		&StepRegisterAMI{},
 		&awscommon.StepCreateTags{Tags: b.config.Tags},
-		&awscommon.StepModifyAttributes{
+		&awscommon.StepModifyAMIAttributes{
 			Description:  b.config.AMIDescription,
 			Users:        b.config.AMIUsers,
 			Groups:       b.config.AMIGroups,