diff --git a/builtin/providers/aws/resource_aws_elb.go b/builtin/providers/aws/resource_aws_elb.go
index 4a4364e6b..87894873d 100644
--- a/builtin/providers/aws/resource_aws_elb.go
+++ b/builtin/providers/aws/resource_aws_elb.go
@@ -85,12 +85,12 @@ func resource_aws_elb_diff(
 	meta interface{}) (*terraform.ResourceDiff, error) {
 
 	b := &diff.ResourceBuilder{
-		CreateComputedAttrs: []string{
-			"dns_name",
+		Attrs: map[string]diff.AttrType{
+			"name": diff.AttrTypeCreate,
 		},
 
-		RequiresNewAttrs: []string{
-			"name",
+		ComputedAttrs: []string{
+			"dns_name",
 		},
 	}
 
diff --git a/builtin/providers/aws/resource_aws_instance.go b/builtin/providers/aws/resource_aws_instance.go
index a1c9e3858..cf40918a0 100644
--- a/builtin/providers/aws/resource_aws_instance.go
+++ b/builtin/providers/aws/resource_aws_instance.go
@@ -104,18 +104,18 @@ func resource_aws_instance_diff(
 	c *terraform.ResourceConfig,
 	meta interface{}) (*terraform.ResourceDiff, error) {
 	b := &diff.ResourceBuilder{
-		CreateComputedAttrs: []string{
+		Attrs: map[string]diff.AttrType{
+			"ami":               diff.AttrTypeCreate,
+			"availability_zone": diff.AttrTypeCreate,
+			"instance_type":     diff.AttrTypeCreate,
+		},
+
+		ComputedAttrs: []string{
 			"public_dns",
 			"public_ip",
 			"private_dns",
 			"private_ip",
 		},
-
-		RequiresNewAttrs: []string{
-			"ami",
-			"availability_zone",
-			"instance_type",
-		},
 	}
 
 	return b.Diff(s, c)