diff --git a/azurerm/data_source_arm_container_registry.go b/azurerm/data_source_container_registry.go
similarity index 96%
rename from azurerm/data_source_arm_container_registry.go
rename to azurerm/data_source_container_registry.go
index bea07de68675..aa1e85111a75 100644
--- a/azurerm/data_source_arm_container_registry.go
+++ b/azurerm/data_source_container_registry.go
@@ -20,31 +20,40 @@ func dataSourceArmContainerRegistry() *schema.Resource {
 			},
 
 			"resource_group_name": resourceGroupNameForDataSourceSchema(),
-			"location":            locationForDataSourceSchema(),
+
+			"location": locationForDataSourceSchema(),
+
 			"admin_enabled": {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
+
 			"admin_password": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
 			"admin_username": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
 			"login_server": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
 			"sku": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
 			"storage_account_id": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
+			"tags": tagsForDataSourceSchema(),
 		},
 	}
 }
diff --git a/azurerm/data_source_arm_container_registry_test.go b/azurerm/data_source_container_registry_test.go
similarity index 100%
rename from azurerm/data_source_arm_container_registry_test.go
rename to azurerm/data_source_container_registry_test.go
diff --git a/azurerm/data_source_arm_virtual_machine.go b/azurerm/data_source_virtual_machine.go
similarity index 100%
rename from azurerm/data_source_arm_virtual_machine.go
rename to azurerm/data_source_virtual_machine.go
diff --git a/azurerm/data_source_arm_virtual_machine_test.go b/azurerm/data_source_virtual_machine_test.go
similarity index 100%
rename from azurerm/data_source_arm_virtual_machine_test.go
rename to azurerm/data_source_virtual_machine_test.go
diff --git a/azurerm/resource_arm_virtual_machine_scale_set_test.go b/azurerm/resource_arm_virtual_machine_scale_set_test.go
index ff3d25e8569e..1642a4f0b8d0 100644
--- a/azurerm/resource_arm_virtual_machine_scale_set_test.go
+++ b/azurerm/resource_arm_virtual_machine_scale_set_test.go
@@ -4790,7 +4790,7 @@ resource "azurerm_virtual_machine_scale_set" "test" {
   health_probe_id     = "${azurerm_lb_probe.test.id}"
   depends_on          = ["azurerm_lb_rule.test"]
 
-  %[4]s#_#" sku {
+  %[4]s sku {
     name     = "Standard_F2"
     tier     = "Standard"
     capacity = 1