diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/billing.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/billing.json
index b3264e255765..ff1478cd331a 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/billing.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/billing.json
@@ -16,18 +16,18 @@
     "application/json"
   ],
   "paths": {
-    "/providers/Microsoft.Billing/billingAccounts": {
+    "/providers/Microsoft.Billing/enrollmentAccounts": {
       "get": {
         "tags": [
-          "BillingAccounts"
+          "EnrollmentAccounts"
         ],
         "x-ms-examples": {
-          "BillingAccountsList": {
-            "$ref": "./examples/BillingAccountsList.json"
+          "EnrollmentAccountsList": {
+            "$ref": "./examples/EnrollmentAccountsList.json"
           }
         },
-        "operationId": "BillingAccounts_List",
-        "description": "Lists the billing accounts the caller has access to.",
+        "operationId": "EnrollmentAccounts_List",
+        "description": "Lists the enrollment accounts the caller has access to.",
         "parameters": [
           {
             "$ref": "#/parameters/apiVersionParameter"
@@ -37,7 +37,7 @@
           "200": {
             "description": "OK. The request has succeeded.",
             "schema": {
-              "$ref": "#/definitions/BillingAccountListResult"
+              "$ref": "#/definitions/EnrollmentAccountListResult"
             }
           },
           "default": {
@@ -49,23 +49,23 @@
         }
       }
     },
-    "/providers/Microsoft.Billing/billingAccounts/{name}": {
+    "/providers/Microsoft.Billing/enrollmentAccounts/{name}": {
       "get": {
         "tags": [
-          "BillingAccounts"
+          "EnrollmentAccounts"
         ],
         "x-ms-examples": {
-          "BillingAccountsGet": {
-            "$ref": "./examples/BillingAccountsGet.json"
+          "EnrollmentAccountsGet": {
+            "$ref": "./examples/EnrollmentAccountsGet.json"
           }
         },
-        "operationId": "BillingAccounts_Get",
-        "description": "Gets a billing account by name.",
+        "operationId": "EnrollmentAccounts_Get",
+        "description": "Gets a enrollment account by name.",
         "parameters": [
           {
             "name": "name",
             "in": "path",
-            "description": "Billing Account name.",
+            "description": "Enrollment Account name.",
             "required": true,
             "type": "string"
           },
@@ -77,7 +77,7 @@
           "200": {
             "description": "OK. The request has succeeded.",
             "schema": {
-              "$ref": "#/definitions/BillingAccountResult"
+              "$ref": "#/definitions/EnrollmentAccountResult"
             }
           },
           "default": {
@@ -384,8 +384,8 @@
     }
   },
   "definitions": {
-    "BillingAccountResult": {
-      "description": "A billing account resource.",
+    "EnrollmentAccountResult": {
+      "description": "An enrollment account resource.",
       "type": "object",
       "allOf": [
         {
@@ -394,27 +394,27 @@
       ],
       "properties": {
         "properties": {
-          "description": "A billing account.",
+          "description": "An enrollment account.",
           "x-ms-client-flatten": true,
-          "$ref": "#/definitions/BillingAccountProperties"
+          "$ref": "#/definitions/EnrollmentAccountProperties"
         }
       }
     },
-    "BillingAccountListResult": {
-      "description": "Result of listing billing accounts.",
+    "EnrollmentAccountListResult": {
+      "description": "Result of listing enrollment accounts.",
       "properties": {
         "value": {
-          "description": "The list of billing accounts.",
+          "description": "The list of enrollment accounts.",
           "type": "array",
           "readOnly": true,
           "items": {
-            "$ref": "#/definitions/BillingAccountResult"
+            "$ref": "#/definitions/EnrollmentAccountResult"
           }
         }
       }
     },
-    "BillingAccountProperties": {
-      "description": "The properties of the billing account.",
+    "EnrollmentAccountProperties": {
+      "description": "The properties of the enrollment account.",
       "properties": {
 	    "principalName": {
           "description": "The account owner's principal name.",
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/examples/BillingAccountsGet.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/examples/EnrollmentAccountsGet.json
similarity index 66%
rename from specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/examples/BillingAccountsGet.json
rename to specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/examples/EnrollmentAccountsGet.json
index 99590e48edcb..47aad7a49983 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/examples/BillingAccountsGet.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/examples/EnrollmentAccountsGet.json
@@ -6,9 +6,9 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/billingAccounts/e1bf1c8c-5ac6-44a0-bdcd-aa7c1cf60556",
+        "id": "/providers/Microsoft.Billing/enrollmentAccounts/e1bf1c8c-5ac6-44a0-bdcd-aa7c1cf60556",
         "name": "e1bf1c8c-5ac6-44a0-bdcd-aa7c1cf60556",
-        "type": "Microsoft.Billing/billingAccounts",
+        "type": "Microsoft.Billing/enrollmentAccounts",
         "properties": {
           "principalName": "kathy@contoso.com"
         }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/examples/BillingAccountsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/examples/EnrollmentAccountsList.json
similarity index 60%
rename from specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/examples/BillingAccountsList.json
rename to specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/examples/EnrollmentAccountsList.json
index ac4d69565073..1e6272f16292 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/examples/BillingAccountsList.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/examples/EnrollmentAccountsList.json
@@ -7,17 +7,17 @@
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/e1bf1c8c-5ac6-44a0-bdcd-aa7c1cf60556",
+            "id": "/providers/Microsoft.Billing/enrollmentAccounts/e1bf1c8c-5ac6-44a0-bdcd-aa7c1cf60556",
             "name": "e1bf1c8c-5ac6-44a0-bdcd-aa7c1cf60556",
-            "type": "Microsoft.Billing/billingAccounts",
+            "type": "Microsoft.Billing/enrollmentAccounts",
             "properties": {
               "principalName": "kathy@contoso.com"
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/edd24053-07cd-4ed4-aa5b-326160a6680d",
+            "id": "/providers/Microsoft.Billing/enrollmentAccounts/edd24053-07cd-4ed4-aa5b-326160a6680d",
             "name": "edd24053-07cd-4ed4-aa5b-326160a6680d",
-            "type": "Microsoft.Billing/billingAccounts",
+            "type": "Microsoft.Billing/enrollmentAccounts",
             "properties": {
               "principalName": "dan@contoso.com"
             }