diff --git a/builtin/providers/aws/resource_aws_db_instance_test.go b/builtin/providers/aws/resource_aws_db_instance_test.go
index 7421c8701..f44d4df31 100644
--- a/builtin/providers/aws/resource_aws_db_instance_test.go
+++ b/builtin/providers/aws/resource_aws_db_instance_test.go
@@ -407,7 +407,7 @@ resource "aws_db_instance" "bar" {
 var testAccAWSDBInstanceConfigWithOptionGroup = fmt.Sprintf(`
 
 resource "aws_db_option_group" "bar" {
-	option_group_name = "option-group-test-terraform"
+	name = "option-group-test-terraform"
 	option_group_description = "Test option group for terraform"
 	engine_name = "mysql"
 	major_engine_version = "5.6"
@@ -426,7 +426,7 @@ resource "aws_db_instance" "bar" {
 	backup_retention_period = 0
 
 	parameter_group_name = "default.mysql5.6"
-	option_group_name = "${aws_db_option_group.bar.option_group_name}"
+	option_group_name = "${aws_db_option_group.bar.name}"
 }`, acctest.RandInt())
 
 func testAccReplicaInstanceConfig(val int) string {
diff --git a/website/source/docs/providers/aws/r/db_option_group.html.markdown b/website/source/docs/providers/aws/r/db_option_group.html.markdown
index 1d78f2fbd..b30ac4f33 100644
--- a/website/source/docs/providers/aws/r/db_option_group.html.markdown
+++ b/website/source/docs/providers/aws/r/db_option_group.html.markdown
@@ -12,7 +12,7 @@ Provides an RDS DB option group resource.
 
 ```
 resource "aws_db_option_group" "bar" {
-  option_group_name = "option-group-test-terraform"
+  name = "option-group-test-terraform"
   option_group_description = "Terraform Option Group"
   engine_name = "sqlserver-ee"
   major_engine_version = "11.00"
@@ -33,7 +33,7 @@ resource "aws_db_option_group" "bar" {
 
 The following arguments are supported:
 
-* `option_group_name` - (Required) The name of the Option group to be created.
+* `name` - (Required) The name of the Option group to be created.
 * `option_group_description` - (Required) The description of the option group.
 * `engine_name` - (Required) Specifies the name of the engine that this option group should be associated with..
 * `major_engine_version` - (Required) Specifies the major version of the engine that this option group should be associated with.