diff --git a/builtin/providers/azurerm/resource_arm_availability_set_test.go b/builtin/providers/azurerm/resource_arm_availability_set_test.go
index 471c48c95..55e911966 100644
--- a/builtin/providers/azurerm/resource_arm_availability_set_test.go
+++ b/builtin/providers/azurerm/resource_arm_availability_set_test.go
@@ -152,7 +152,7 @@ func testCheckAzureRMAvailabilitySetDestroy(s *terraform.State) error {
 
 var testAccAzureRMVAvailabilitySet_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_availability_set" "test" {
@@ -164,7 +164,7 @@ resource "azurerm_availability_set" "test" {
 
 var testAccAzureRMVAvailabilitySet_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_availability_set" "test" {
@@ -181,7 +181,7 @@ resource "azurerm_availability_set" "test" {
 
 var testAccAzureRMVAvailabilitySet_withUpdatedTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_availability_set" "test" {
@@ -197,7 +197,7 @@ resource "azurerm_availability_set" "test" {
 
 var testAccAzureRMVAvailabilitySet_withDomainCounts = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_availability_set" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_cdn_endpoint_test.go b/builtin/providers/azurerm/resource_arm_cdn_endpoint_test.go
index bdcd89bd2..6f7b1687a 100644
--- a/builtin/providers/azurerm/resource_arm_cdn_endpoint_test.go
+++ b/builtin/providers/azurerm/resource_arm_cdn_endpoint_test.go
@@ -124,7 +124,7 @@ func testCheckAzureRMCdnEndpointDestroy(s *terraform.State) error {
 
 var testAccAzureRMCdnEndpoint_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_cdn_profile" "test" {
@@ -151,7 +151,7 @@ resource "azurerm_cdn_endpoint" "test" {
 
 var testAccAzureRMCdnEndpoint_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_cdn_profile" "test" {
@@ -183,7 +183,7 @@ resource "azurerm_cdn_endpoint" "test" {
 
 var testAccAzureRMCdnEndpoint_withTagsUpdate = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_cdn_profile" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_cdn_profile_test.go b/builtin/providers/azurerm/resource_arm_cdn_profile_test.go
index 01afe35f3..7718ac974 100644
--- a/builtin/providers/azurerm/resource_arm_cdn_profile_test.go
+++ b/builtin/providers/azurerm/resource_arm_cdn_profile_test.go
@@ -164,7 +164,7 @@ func testCheckAzureRMCdnProfileDestroy(s *terraform.State) error {
 
 var testAccAzureRMCdnProfile_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_cdn_profile" "test" {
@@ -177,7 +177,7 @@ resource "azurerm_cdn_profile" "test" {
 
 var testAccAzureRMCdnProfile_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_cdn_profile" "test" {
@@ -195,7 +195,7 @@ resource "azurerm_cdn_profile" "test" {
 
 var testAccAzureRMCdnProfile_withTagsUpdate = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_cdn_profile" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_dns_a_record_test.go b/builtin/providers/azurerm/resource_arm_dns_a_record_test.go
index 0db25e2e9..41724cf14 100644
--- a/builtin/providers/azurerm/resource_arm_dns_a_record_test.go
+++ b/builtin/providers/azurerm/resource_arm_dns_a_record_test.go
@@ -142,7 +142,7 @@ func testCheckAzureRMDnsARecordDestroy(s *terraform.State) error {
 
 var testAccAzureRMDnsARecord_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -161,7 +161,7 @@ resource "azurerm_dns_a_record" "test" {
 
 var testAccAzureRMDnsARecord_updateRecords = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -180,7 +180,7 @@ resource "azurerm_dns_a_record" "test" {
 
 var testAccAzureRMDnsARecord_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -204,7 +204,7 @@ resource "azurerm_dns_a_record" "test" {
 
 var testAccAzureRMDnsARecord_withTagsUpdate = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_dns_aaaa_record_test.go b/builtin/providers/azurerm/resource_arm_dns_aaaa_record_test.go
index 489048617..a0e3dafc7 100644
--- a/builtin/providers/azurerm/resource_arm_dns_aaaa_record_test.go
+++ b/builtin/providers/azurerm/resource_arm_dns_aaaa_record_test.go
@@ -142,7 +142,7 @@ func testCheckAzureRMDnsAAAARecordDestroy(s *terraform.State) error {
 
 var testAccAzureRMDnsAAAARecord_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -161,7 +161,7 @@ resource "azurerm_dns_aaaa_record" "test" {
 
 var testAccAzureRMDnsAAAARecord_updateRecords = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -180,7 +180,7 @@ resource "azurerm_dns_aaaa_record" "test" {
 
 var testAccAzureRMDnsAAAARecord_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -204,7 +204,7 @@ resource "azurerm_dns_aaaa_record" "test" {
 
 var testAccAzureRMDnsAAAARecord_withTagsUpdate = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_dns_cname_record_test.go b/builtin/providers/azurerm/resource_arm_dns_cname_record_test.go
index 7c29ced9f..0207a2dc0 100644
--- a/builtin/providers/azurerm/resource_arm_dns_cname_record_test.go
+++ b/builtin/providers/azurerm/resource_arm_dns_cname_record_test.go
@@ -159,7 +159,7 @@ func testCheckAzureRMDnsCNameRecordDestroy(s *terraform.State) error {
 
 var testAccAzureRMDnsCNameRecord_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -178,7 +178,7 @@ resource "azurerm_dns_cname_record" "test" {
 
 var testAccAzureRMDnsCNameRecord_subdomain = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -197,7 +197,7 @@ resource "azurerm_dns_cname_record" "test" {
 
 var testAccAzureRMDnsCNameRecord_updateRecords = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -216,7 +216,7 @@ resource "azurerm_dns_cname_record" "test" {
 
 var testAccAzureRMDnsCNameRecord_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -240,7 +240,7 @@ resource "azurerm_dns_cname_record" "test" {
 
 var testAccAzureRMDnsCNameRecord_withTagsUpdate = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_dns_mx_record_test.go b/builtin/providers/azurerm/resource_arm_dns_mx_record_test.go
index b7b4cc403..e3ef8b836 100644
--- a/builtin/providers/azurerm/resource_arm_dns_mx_record_test.go
+++ b/builtin/providers/azurerm/resource_arm_dns_mx_record_test.go
@@ -142,7 +142,7 @@ func testCheckAzureRMDnsMxRecordDestroy(s *terraform.State) error {
 
 var testAccAzureRMDnsMxRecord_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -170,7 +170,7 @@ resource "azurerm_dns_mx_record" "test" {
 
 var testAccAzureRMDnsMxRecord_updateRecords = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -203,7 +203,7 @@ resource "azurerm_dns_mx_record" "test" {
 
 var testAccAzureRMDnsMxRecord_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -236,7 +236,7 @@ resource "azurerm_dns_mx_record" "test" {
 
 var testAccAzureRMDnsMxRecord_withTagsUpdate = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_dns_ns_record_test.go b/builtin/providers/azurerm/resource_arm_dns_ns_record_test.go
index 4fb2cd903..2636c5ed2 100644
--- a/builtin/providers/azurerm/resource_arm_dns_ns_record_test.go
+++ b/builtin/providers/azurerm/resource_arm_dns_ns_record_test.go
@@ -142,7 +142,7 @@ func testCheckAzureRMDnsNsRecordDestroy(s *terraform.State) error {
 
 var testAccAzureRMDnsNsRecord_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -168,7 +168,7 @@ resource "azurerm_dns_ns_record" "test" {
 
 var testAccAzureRMDnsNsRecord_updateRecords = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -198,7 +198,7 @@ resource "azurerm_dns_ns_record" "test" {
 
 var testAccAzureRMDnsNsRecord_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -229,7 +229,7 @@ resource "azurerm_dns_ns_record" "test" {
 
 var testAccAzureRMDnsNsRecord_withTagsUpdate = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_dns_srv_record_test.go b/builtin/providers/azurerm/resource_arm_dns_srv_record_test.go
index 35d860191..15b30b29b 100644
--- a/builtin/providers/azurerm/resource_arm_dns_srv_record_test.go
+++ b/builtin/providers/azurerm/resource_arm_dns_srv_record_test.go
@@ -142,7 +142,7 @@ func testCheckAzureRMDnsSrvRecordDestroy(s *terraform.State) error {
 
 var testAccAzureRMDnsSrvRecord_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -174,7 +174,7 @@ resource "azurerm_dns_srv_record" "test" {
 
 var testAccAzureRMDnsSrvRecord_updateRecords = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -213,7 +213,7 @@ resource "azurerm_dns_srv_record" "test" {
 
 var testAccAzureRMDnsSrvRecord_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -250,7 +250,7 @@ resource "azurerm_dns_srv_record" "test" {
 
 var testAccAzureRMDnsSrvRecord_withTagsUpdate = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_dns_txt_record_test.go b/builtin/providers/azurerm/resource_arm_dns_txt_record_test.go
index 99fbfaedf..a80385bd5 100644
--- a/builtin/providers/azurerm/resource_arm_dns_txt_record_test.go
+++ b/builtin/providers/azurerm/resource_arm_dns_txt_record_test.go
@@ -142,7 +142,7 @@ func testCheckAzureRMDnsTxtRecordDestroy(s *terraform.State) error {
 
 var testAccAzureRMDnsTxtRecord_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -168,7 +168,7 @@ resource "azurerm_dns_txt_record" "test" {
 
 var testAccAzureRMDnsTxtRecord_updateRecords = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -198,7 +198,7 @@ resource "azurerm_dns_txt_record" "test" {
 
 var testAccAzureRMDnsTxtRecord_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
@@ -229,7 +229,7 @@ resource "azurerm_dns_txt_record" "test" {
 
 var testAccAzureRMDnsTxtRecord_withTagsUpdate = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_dns_zone_test.go b/builtin/providers/azurerm/resource_arm_dns_zone_test.go
index 87b7b8758..2e59cf96e 100644
--- a/builtin/providers/azurerm/resource_arm_dns_zone_test.go
+++ b/builtin/providers/azurerm/resource_arm_dns_zone_test.go
@@ -80,7 +80,7 @@ func testCheckAzureRMDnsZoneDestroy(s *terraform.State) error {
 
 var testAccAzureRMDnsZone_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_dns_zone" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_public_ip_test.go b/builtin/providers/azurerm/resource_arm_public_ip_test.go
index a553458b4..6ff85b28c 100644
--- a/builtin/providers/azurerm/resource_arm_public_ip_test.go
+++ b/builtin/providers/azurerm/resource_arm_public_ip_test.go
@@ -267,7 +267,7 @@ func testCheckAzureRMPublicIpDestroy(s *terraform.State) error {
 
 var testAccAzureRMVPublicIpStatic_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_public_ip" "test" {
@@ -280,7 +280,7 @@ resource "azurerm_public_ip" "test" {
 
 var testAccAzureRMVPublicIpStatic_update = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_public_ip" "test" {
@@ -294,7 +294,7 @@ resource "azurerm_public_ip" "test" {
 
 var testAccAzureRMVPublicIpStatic_idleTimeout = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_public_ip" "test" {
@@ -308,7 +308,7 @@ resource "azurerm_public_ip" "test" {
 
 var testAccAzureRMVPublicIpDynamic_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_public_ip" "test" {
@@ -321,7 +321,7 @@ resource "azurerm_public_ip" "test" {
 
 var testAccAzureRMVPublicIpStatic_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_public_ip" "test" {
@@ -339,7 +339,7 @@ resource "azurerm_public_ip" "test" {
 
 var testAccAzureRMVPublicIpStatic_withTagsUpdate = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_public_ip" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_resource_group_test.go b/builtin/providers/azurerm/resource_arm_resource_group_test.go
index c2f9993ec..3ad9c5b37 100644
--- a/builtin/providers/azurerm/resource_arm_resource_group_test.go
+++ b/builtin/providers/azurerm/resource_arm_resource_group_test.go
@@ -117,14 +117,14 @@ func testCheckAzureRMResourceGroupDestroy(s *terraform.State) error {
 
 var testAccAzureRMResourceGroup_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 `
 
 var testAccAzureRMResourceGroup_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 
     tags {
@@ -136,7 +136,7 @@ resource "azurerm_resource_group" "test" {
 
 var testAccAzureRMResourceGroup_withTagsUpdated = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 
     tags {
diff --git a/builtin/providers/azurerm/resource_arm_route_table_test.go b/builtin/providers/azurerm/resource_arm_route_table_test.go
index 200d0651f..bd2ce8132 100644
--- a/builtin/providers/azurerm/resource_arm_route_table_test.go
+++ b/builtin/providers/azurerm/resource_arm_route_table_test.go
@@ -204,7 +204,7 @@ func testCheckAzureRMRouteTableDestroy(s *terraform.State) error {
 
 var testAccAzureRMRouteTable_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -223,7 +223,7 @@ resource "azurerm_route_table" "test" {
 
 var testAccAzureRMRouteTable_multipleRoutes = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -248,7 +248,7 @@ resource "azurerm_route_table" "test" {
 
 var testAccAzureRMRouteTable_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -272,7 +272,7 @@ resource "azurerm_route_table" "test" {
 
 var testAccAzureRMRouteTable_withTagsUpdate = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
diff --git a/builtin/providers/azurerm/resource_arm_route_test.go b/builtin/providers/azurerm/resource_arm_route_test.go
index 6a664e9bf..d9159e05c 100644
--- a/builtin/providers/azurerm/resource_arm_route_test.go
+++ b/builtin/providers/azurerm/resource_arm_route_test.go
@@ -116,7 +116,7 @@ func testCheckAzureRMRouteDestroy(s *terraform.State) error {
 
 var testAccAzureRMRoute_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -138,7 +138,7 @@ resource "azurerm_route" "test" {
 
 var testAccAzureRMRoute_multipleRoutes = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
diff --git a/builtin/providers/azurerm/resource_arm_search_service_test.go b/builtin/providers/azurerm/resource_arm_search_service_test.go
index 51f9c4bf7..133b90396 100644
--- a/builtin/providers/azurerm/resource_arm_search_service_test.go
+++ b/builtin/providers/azurerm/resource_arm_search_service_test.go
@@ -117,7 +117,7 @@ func testCheckAzureRMSearchServiceDestroy(s *terraform.State) error {
 
 var testAccAzureRMSearchService_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_search_service" "test" {
@@ -135,7 +135,7 @@ resource "azurerm_search_service" "test" {
 
 var testAccAzureRMSearchService_updated = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_search_service" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_servicebus_namespace_test.go b/builtin/providers/azurerm/resource_arm_servicebus_namespace_test.go
index eccb1fbbd..865d70b43 100644
--- a/builtin/providers/azurerm/resource_arm_servicebus_namespace_test.go
+++ b/builtin/providers/azurerm/resource_arm_servicebus_namespace_test.go
@@ -150,7 +150,7 @@ func testCheckAzureRMServiceBusNamespaceExists(name string) resource.TestCheckFu
 
 var testAccAzureRMServiceBusNamespace_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 resource "azurerm_servicebus_namespace" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_sql_database_test.go b/builtin/providers/azurerm/resource_arm_sql_database_test.go
index b7fb27588..08a8db1b8 100644
--- a/builtin/providers/azurerm/resource_arm_sql_database_test.go
+++ b/builtin/providers/azurerm/resource_arm_sql_database_test.go
@@ -143,7 +143,7 @@ func testCheckAzureRMSqlDatabaseDestroy(s *terraform.State) error {
 
 var testAccAzureRMSqlDatabase_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_sql_server" "test" {
@@ -169,7 +169,7 @@ resource "azurerm_sql_database" "test" {
 
 var testAccAzureRMSqlDatabase_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_sql_server" "test" {
@@ -200,7 +200,7 @@ resource "azurerm_sql_database" "test" {
 
 var testAccAzureRMSqlDatabase_withTagsUpdate = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_sql_server" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_sql_firewall_rule_test.go b/builtin/providers/azurerm/resource_arm_sql_firewall_rule_test.go
index 63d19dae6..9770a10e6 100644
--- a/builtin/providers/azurerm/resource_arm_sql_firewall_rule_test.go
+++ b/builtin/providers/azurerm/resource_arm_sql_firewall_rule_test.go
@@ -92,7 +92,7 @@ func testCheckAzureRMSqlFirewallRuleDestroy(s *terraform.State) error {
 
 var testAccAzureRMSqlFirewallRule_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_sql_server" "test" {
@@ -115,7 +115,7 @@ resource "azurerm_sql_firewall_rule" "test" {
 
 var testAccAzureRMSqlFirewallRule_withUpdates = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_sql_server" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_sql_server_test.go b/builtin/providers/azurerm/resource_arm_sql_server_test.go
index 1236c154c..fb0a44f10 100644
--- a/builtin/providers/azurerm/resource_arm_sql_server_test.go
+++ b/builtin/providers/azurerm/resource_arm_sql_server_test.go
@@ -111,7 +111,7 @@ func testCheckAzureRMSqlServerDestroy(s *terraform.State) error {
 
 var testAccAzureRMSqlServer_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_sql_server" "test" {
@@ -126,7 +126,7 @@ resource "azurerm_sql_server" "test" {
 
 var testAccAzureRMSqlServer_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_sql_server" "test" {
@@ -146,7 +146,7 @@ resource "azurerm_sql_server" "test" {
 
 var testAccAzureRMSqlServer_withTagsUpdated = `
 resource "azurerm_resource_group" "test" {
-    name = "acctest_rg_%d"
+    name = "acctestRG_%d"
     location = "West US"
 }
 resource "azurerm_sql_server" "test" {
diff --git a/builtin/providers/azurerm/resource_arm_storage_blob_test.go b/builtin/providers/azurerm/resource_arm_storage_blob_test.go
index 4a5794fb0..72c099ab8 100644
--- a/builtin/providers/azurerm/resource_arm_storage_blob_test.go
+++ b/builtin/providers/azurerm/resource_arm_storage_blob_test.go
@@ -426,7 +426,7 @@ func testCheckAzureRMStorageBlobDestroy(s *terraform.State) error {
 
 var testAccAzureRMStorageBlob_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "westus"
 }
 
@@ -462,7 +462,7 @@ resource "azurerm_storage_blob" "test" {
 
 var testAccAzureRMStorageBlobBlock_source = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "westus"
 }
 
@@ -500,7 +500,7 @@ resource "azurerm_storage_blob" "source" {
 
 var testAccAzureRMStorageBlobPage_source = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "westus"
 }
 
@@ -538,7 +538,7 @@ resource "azurerm_storage_blob" "source" {
 
 var testAccAzureRMStorageBlob_source_uri = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "westus"
 }
 
diff --git a/builtin/providers/azurerm/resource_arm_storage_container_test.go b/builtin/providers/azurerm/resource_arm_storage_container_test.go
index ee92b14bd..522b82b26 100644
--- a/builtin/providers/azurerm/resource_arm_storage_container_test.go
+++ b/builtin/providers/azurerm/resource_arm_storage_container_test.go
@@ -217,7 +217,7 @@ func TestValidateArmStorageContainerName(t *testing.T) {
 
 var testAccAzureRMStorageContainer_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "westus"
 }
 
diff --git a/builtin/providers/azurerm/resource_arm_storage_queue_test.go b/builtin/providers/azurerm/resource_arm_storage_queue_test.go
index a71f6e5a7..f561eadf7 100644
--- a/builtin/providers/azurerm/resource_arm_storage_queue_test.go
+++ b/builtin/providers/azurerm/resource_arm_storage_queue_test.go
@@ -145,7 +145,7 @@ func testCheckAzureRMStorageQueueDestroy(s *terraform.State) error {
 
 var testAccAzureRMStorageQueue_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "westus"
 }
 
diff --git a/builtin/providers/azurerm/resource_arm_storage_table_test.go b/builtin/providers/azurerm/resource_arm_storage_table_test.go
index ca184d72d..3da97168f 100644
--- a/builtin/providers/azurerm/resource_arm_storage_table_test.go
+++ b/builtin/providers/azurerm/resource_arm_storage_table_test.go
@@ -214,7 +214,7 @@ func TestValidateArmStorageTableName(t *testing.T) {
 
 var testAccAzureRMStorageTable_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "westus"
 }
 
diff --git a/builtin/providers/azurerm/resource_arm_subnet_test.go b/builtin/providers/azurerm/resource_arm_subnet_test.go
index 844e04f99..bb5abf7ea 100644
--- a/builtin/providers/azurerm/resource_arm_subnet_test.go
+++ b/builtin/providers/azurerm/resource_arm_subnet_test.go
@@ -88,7 +88,7 @@ func testCheckAzureRMSubnetDestroy(s *terraform.State) error {
 
 var testAccAzureRMSubnet_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
diff --git a/builtin/providers/azurerm/resource_arm_template_deployment_test.go b/builtin/providers/azurerm/resource_arm_template_deployment_test.go
index efb64ce0c..556d79728 100644
--- a/builtin/providers/azurerm/resource_arm_template_deployment_test.go
+++ b/builtin/providers/azurerm/resource_arm_template_deployment_test.go
@@ -120,7 +120,7 @@ func testCheckAzureRMTemplateDeploymentDestroy(s *terraform.State) error {
 
 var testAccAzureRMTemplateDeployment_basicExample = `
   resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
   }
 
@@ -185,7 +185,7 @@ DEPLOY
 
 var testAccAzureRMTemplateDeployment_withParams = `
   resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
   }
 
@@ -270,7 +270,7 @@ DEPLOY
 // StorageAccount name is too long, forces error
 var testAccAzureRMTemplateDeployment_withError = `
   resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
   }
 
diff --git a/builtin/providers/azurerm/resource_arm_traffic_manager_endpoint_test.go b/builtin/providers/azurerm/resource_arm_traffic_manager_endpoint_test.go
index ea1ec0bf0..2aad427c6 100644
--- a/builtin/providers/azurerm/resource_arm_traffic_manager_endpoint_test.go
+++ b/builtin/providers/azurerm/resource_arm_traffic_manager_endpoint_test.go
@@ -211,7 +211,7 @@ func testCheckAzureRMTrafficManagerEndpointDestroy(s *terraform.State) error {
 
 var testAccAzureRMTrafficManagerEndpoint_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -261,7 +261,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternal" {
 
 var testAccAzureRMTrafficManagerEndpoint_basicDisableExternal = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -312,7 +312,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternal" {
 
 var testAccAzureRMTrafficManagerEndpoint_weight = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -354,7 +354,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" {
 
 var testAccAzureRMTrafficManagerEndpoint_updateWeight = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -396,7 +396,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" {
 
 var testAccAzureRMTrafficManagerEndpoint_priority = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -438,7 +438,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" {
 
 var testAccAzureRMTrafficManagerEndpoint_updatePriority = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -480,7 +480,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" {
 
 var testAccAzureRMTrafficManagerEndpoint_nestedEndpoints = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
diff --git a/builtin/providers/azurerm/resource_arm_traffic_manager_profile_test.go b/builtin/providers/azurerm/resource_arm_traffic_manager_profile_test.go
index 66e4caf82..f5282c825 100644
--- a/builtin/providers/azurerm/resource_arm_traffic_manager_profile_test.go
+++ b/builtin/providers/azurerm/resource_arm_traffic_manager_profile_test.go
@@ -175,7 +175,7 @@ func testCheckAzureRMTrafficManagerProfileDestroy(s *terraform.State) error {
 
 var testAccAzureRMTrafficManagerProfile_weighted = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -199,7 +199,7 @@ resource "azurerm_traffic_manager_profile" "test" {
 
 var testAccAzureRMTrafficManagerProfile_performance = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -223,7 +223,7 @@ resource "azurerm_traffic_manager_profile" "test" {
 
 var testAccAzureRMTrafficManagerProfile_priority = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -247,7 +247,7 @@ resource "azurerm_traffic_manager_profile" "test" {
 
 var testAccAzureRMTrafficManagerProfile_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -276,7 +276,7 @@ resource "azurerm_traffic_manager_profile" "test" {
 
 var testAccAzureRMTrafficManagerProfile_withTagsUpdated = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
diff --git a/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set_test.go b/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set_test.go
index baf80f86d..0245ea7b9 100644
--- a/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set_test.go
+++ b/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set_test.go
@@ -103,7 +103,7 @@ func testCheckAzureRMVirtualMachineScaleSetDestroy(s *terraform.State) error {
 
 var testAccAzureRMVirtualMachineScaleSet_basicLinux = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -196,7 +196,7 @@ resource "azurerm_virtual_machine_scale_set" "test" {
 
 var testAccAzureRMVirtualMachineScaleSet_basicWindows = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
diff --git a/builtin/providers/azurerm/resource_arm_virtual_machine_test.go b/builtin/providers/azurerm/resource_arm_virtual_machine_test.go
index bf34640ae..4a5e9b771 100644
--- a/builtin/providers/azurerm/resource_arm_virtual_machine_test.go
+++ b/builtin/providers/azurerm/resource_arm_virtual_machine_test.go
@@ -411,7 +411,7 @@ func testCheckAzureRMVirtualMachineVHDExistance(name string, shouldExist bool) r
 
 var testAccAzureRMVirtualMachine_basicLinuxMachine = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -499,7 +499,7 @@ resource "azurerm_virtual_machine" "test" {
 
 var testAccAzureRMVirtualMachine_machineNameBeforeUpdate = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -588,7 +588,7 @@ resource "azurerm_virtual_machine" "test" {
 
 var testAccAzureRMVirtualMachine_basicLinuxMachineDestroyDisks = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -688,7 +688,7 @@ resource "azurerm_virtual_machine" "test" {
 
 var testAccAzureRMVirtualMachine_basicLinuxMachineDeleteVM = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -739,7 +739,7 @@ resource "azurerm_storage_container" "test" {
 
 var testAccAzureRMVirtualMachine_withDataDisk = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -835,7 +835,7 @@ resource "azurerm_virtual_machine" "test" {
 
 var testAccAzureRMVirtualMachine_basicLinuxMachineUpdated = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -922,7 +922,7 @@ resource "azurerm_virtual_machine" "test" {
 
 var testAccAzureRMVirtualMachine_updatedLinuxMachine = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -1005,7 +1005,7 @@ resource "azurerm_virtual_machine" "test" {
 
 var testAccAzureRMVirtualMachine_basicWindowsMachine = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -1089,7 +1089,7 @@ resource "azurerm_virtual_machine" "test" {
 
 var testAccAzureRMVirtualMachine_windowsUnattendedConfig = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -1179,7 +1179,7 @@ resource "azurerm_virtual_machine" "test" {
 
 var testAccAzureRMVirtualMachine_diagnosticsProfile = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -1265,7 +1265,7 @@ resource "azurerm_virtual_machine" "test" {
 
 var testAccAzureRMVirtualMachine_winRMConfig = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -1350,7 +1350,7 @@ resource "azurerm_virtual_machine" "test" {
 
 var testAccAzureRMVirtualMachine_withAvailabilitySet = `
  resource "azurerm_resource_group" "test" {
-     name = "acctestrg-%d"
+     name = "acctestRG-%d"
      location = "West US"
  }
 
@@ -1441,7 +1441,7 @@ var testAccAzureRMVirtualMachine_withAvailabilitySet = `
 
 var testAccAzureRMVirtualMachine_updateAvailabilitySet = `
  resource "azurerm_resource_group" "test" {
-     name = "acctestrg-%d"
+     name = "acctestRG-%d"
      location = "West US"
  }
 
@@ -1532,7 +1532,7 @@ var testAccAzureRMVirtualMachine_updateAvailabilitySet = `
 
 var testAccAzureRMVirtualMachine_updateMachineName = `
  resource "azurerm_resource_group" "test" {
-     name = "acctestrg-%d"
+     name = "acctestRG-%d"
      location = "West US"
  }
 
diff --git a/builtin/providers/azurerm/resource_arm_virtual_network_peering_test.go b/builtin/providers/azurerm/resource_arm_virtual_network_peering_test.go
index 98ba1c7de..560b557c2 100644
--- a/builtin/providers/azurerm/resource_arm_virtual_network_peering_test.go
+++ b/builtin/providers/azurerm/resource_arm_virtual_network_peering_test.go
@@ -137,7 +137,7 @@ func testCheckAzureRMVirtualNetworkPeeringDestroy(s *terraform.State) error {
 
 var testAccAzureRMVirtualNetworkPeering_basic = `
 resource "azurerm_resource_group" "test" {
-  name     = "acctestrg-%d"
+  name     = "acctestRG-%d"
   location = "West US"
 }
 
@@ -174,7 +174,7 @@ resource "azurerm_virtual_network_peering" "test2" {
 
 var testAccAzureRMVirtualNetworkPeering_basicUpdate = `
 resource "azurerm_resource_group" "test" {
-  name     = "acctestrg-%d"
+  name     = "acctestRG-%d"
   location = "West US"
 }
 
diff --git a/builtin/providers/azurerm/resource_arm_virtual_network_test.go b/builtin/providers/azurerm/resource_arm_virtual_network_test.go
index 3e0660600..bbbe1f2ad 100644
--- a/builtin/providers/azurerm/resource_arm_virtual_network_test.go
+++ b/builtin/providers/azurerm/resource_arm_virtual_network_test.go
@@ -125,7 +125,7 @@ func testCheckAzureRMVirtualNetworkDestroy(s *terraform.State) error {
 
 var testAccAzureRMVirtualNetwork_basic = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -144,7 +144,7 @@ resource "azurerm_virtual_network" "test" {
 
 var testAccAzureRMVirtualNetwork_withTags = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }
 
@@ -168,7 +168,7 @@ resource "azurerm_virtual_network" "test" {
 
 var testAccAzureRMVirtualNetwork_withTagsUpdated = `
 resource "azurerm_resource_group" "test" {
-    name = "acctestrg-%d"
+    name = "acctestRG-%d"
     location = "West US"
 }