diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json
index 121f570b69af..828afc5d8672 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json
@@ -62,46 +62,6 @@
         }
       }
     },
-    "/providers/Microsoft.Billing/listBillingAccountsWithCreateInvoiceSectionPermission": {
-      "get": {
-        "tags": [
-          "BillingAccounts"
-        ],
-        "x-ms-examples": {
-          "BillingAccountsListWithCreateInvoiceSectionPermission": {
-            "$ref": "./examples/BillingAccountsListWithCreateInvoiceSectionPermission.json"
-          }
-        },
-        "operationId": "BillingAccountsWithCreateInvoiceSectionPermission_List",
-        "description": "Lists all billing accounts with create invoiceSection permission for a user.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/apiVersionParameter"
-          },
-          {
-            "name": "$expand",
-            "description": "May be used to expand the invoiceSections and billingProfiles.",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK. The request has succeeded.",
-            "schema": {
-              "$ref": "#/definitions/BillingAccountListResult"
-            }
-          },
-          "default": {
-            "description": "Error response describing why the operation failed.",
-            "schema": {
-              "$ref": "#/definitions/ErrorResponse"
-            }
-          }
-        }
-      }
-    },
     "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}": {
       "get": {
         "tags": [
@@ -1159,7 +1119,7 @@
         }
       }
     },
-    "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfile/{billingProfileName}/billingSubscriptions": {
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/billingSubscriptions": {
       "get": {
         "tags": [
           "BillingSubscriptions"
@@ -3581,7 +3541,7 @@
     "TransferProductRequestProperties": {
       "description": "The properties of the product to initiate a transfer.",
       "properties": {
-        "destinationInvoiceSectionName": {
+        "destinationInvoiceSectionId": {
           "description": "Destination invoice section id.",
           "type": "string"
         }
@@ -3623,9 +3583,9 @@
       "type": "object",
       "description": "Request parameters to transfer billing subscription.",
       "properties": {
-        "destinationInvoiceSectionName": {
+        "destinationInvoiceSectionId": {
           "type": "string",
-          "description": "The destination invoiceSectionName."
+          "description": "The destination invoice section id."
         }
       }
     },
@@ -3693,11 +3653,6 @@
           "type": "string",
           "readOnly": true
         },
-        "company": {
-          "description": "The Company this billing account belongs to.",
-          "type": "string",
-          "readOnly": true
-        },
         "accountType": {
           "description": "The billing account Type.",
           "type": "string",
@@ -3711,20 +3666,25 @@
           "description": "The address associated with billing account.",
           "$ref": "#/definitions/Address"
         },
+        "company": {
+          "description": "Company Name.",
+          "type": "string",
+          "readOnly": true
+        },
         "country": {
-          "description": "The country associated with billing account..",
+          "description": "Country Name.",
           "type": "string",
           "readOnly": true
         },
         "invoiceSections": {
-          "description": "The invoice sections associated to the billing account.",
+          "description": "The invoice sections associated to the billing account. By default this is not populated, unless it's specified in $expand.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/InvoiceSection"
           }
         },
         "billingProfiles": {
-          "description": "The billing profiles associated to the billing account.",
+          "description": "The billing profiles associated to the billing account. By default this is not populated, unless it's specified in $expand.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/BillingProfile"
@@ -3748,17 +3708,33 @@
           "items": {
             "$ref": "#/definitions/EnrollmentAccount"
           }
+        },
+        "hasReadAccess": {
+          "description": "Specifies whether the user has read access on billing account.",
+          "type": "boolean",
+          "readOnly": true
         }
       }
     },
     "BillingProperty": {
+      "description": "A billing property resource.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "description": "A billing property.",
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/BillingPropertySummary"
+        }
+      }
+    },
+    "BillingPropertySummary": {
       "description": "The billing property.",
       "properties": {
-        "productId": {
-          "description": "Product Id.",
-          "type": "string",
-          "readOnly": true
-        },
         "billingTenantId": {
           "description": "Billing tenant Id.",
           "type": "string",
@@ -3784,6 +3760,11 @@
           "type": "string",
           "readOnly": true
         },
+        "costCenter": {
+          "description": "Cost center name.",
+          "type": "string",
+          "readOnly": true
+        },
         "invoiceSectionId": {
           "description": "Invoice Section Id.",
           "type": "string",
@@ -3794,6 +3775,16 @@
           "type": "string",
           "readOnly": true
         },
+        "productId": {
+          "description": "Product Id.",
+          "type": "string",
+          "readOnly": true
+        },
+        "productName": {
+          "description": "Product name.",
+          "type": "string",
+          "readOnly": true
+        },
         "skuId": {
           "description": "SKU Id.",
           "type": "string",
@@ -4053,7 +4044,7 @@
           "description": "Purchase order number.",
           "type": "string"
         },
-        "billingAddress": {
+        "address": {
           "description": "Billing address.",
           "$ref": "#/definitions/Address"
         },
@@ -4189,11 +4180,12 @@
       }
     },
     "EnabledAzureSKUs": {
-      "description": "Details about the product.",
+      "description": "Details about the enabled azure sku.",
       "properties": {
         "skuId": {
           "description": "The sku id.",
-          "type": "string"
+          "type": "string",
+          "readOnly": true
         },
         "skuDescription": {
           "description": "The sku description.",
@@ -4369,13 +4361,13 @@
           "format": "date-time",
           "readOnly": true
         },
-        "billingProfile": {
-          "description": "The profile id which invoice belongs to.",
+        "billingProfileId": {
+          "description": "The billing profile id this invoice belongs to.",
           "type": "string",
           "readOnly": true
         },
         "billingProfileName": {
-          "description": "The profile name which invoice belongs to.",
+          "description": "The profile name this invoice belongs to.",
           "type": "string",
           "readOnly": true
         },
@@ -4670,11 +4662,6 @@
           "readOnly": true,
           "$ref": "#/definitions/Amount"
         },
-        "enrollmentAccountContext": {
-          "description": "The enrollment account context.",
-          "$ref": "#/definitions/EnrollmentAccountContext",
-          "readOnly": true
-        },
         "billingProfileId": {
           "description": "Billing Profile id to which this product belongs.",
           "type": "string",
@@ -4685,6 +4672,16 @@
           "type": "string",
           "readOnly": true
         },
+        "invoiceSectionId": {
+          "description": "Invoice section id to which this product belongs.",
+          "type": "string",
+          "readOnly": true
+        },
+        "invoiceSectionName": {
+          "description": "Invoice section name to which this product belongs.",
+          "type": "string",
+          "readOnly": true
+        },
         "skuId": {
           "description": "The sku id.",
           "type": "string"
@@ -4789,6 +4786,11 @@
           "type": "string",
           "readOnly": true
         },
+        "productFamily": {
+          "description": "The product family.",
+          "type": "string",
+          "readOnly": true
+        },
         "productTypeId": {
           "description": "The product type id.",
           "type": "string",
@@ -4877,12 +4879,16 @@
     "PolicyProperties": {
       "description": "The properties of policy.",
       "properties": {
+        "marketplacePurchasesAllowed": {
+          "description": "The marketplacePurchasesAllowed flag.",
+          "type": "boolean"
+        },
         "reservationPurchasesAllowed": {
           "description": "The reservationPurchasesAllowed flag.",
           "type": "boolean"
         },
-        "marketplacePurchasesAllowed": {
-          "description": "The marketplacePurchasesAllowed flag.",
+        "subscriptionOwnerCanViewCharges": {
+          "description": "The subscriptionOwnerCanViewCharges flag.",
           "type": "boolean"
         }
       }
@@ -4965,7 +4971,7 @@
     "PaymentMethodProperties": {
       "description": "The properties of the payment method.",
       "properties": {
-        "methodType": {
+        "paymentMethodType": {
           "description": "Payment method type.",
           "type": "string",
           "enum": [
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AcceptTransfer.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AcceptTransfer.json
index 290109371d8d..23325f00f3ef 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AcceptTransfer.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AcceptTransfer.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2018-08-01-preview",
+    "api-version": "2018-11-01-preview",
     "transferName": "transferName",
     "body": {
       "properties": {
@@ -26,7 +26,7 @@
           "expirationTime": "2018-11-05T17:32:28Z",
           "transferStatus": "InProgress",
           "recipientEmailId": "user@contoso.com",
-          "initiatorEmailId": "user@contoso.com",
+          "initiatorEmailId": "xyz@contoso.com",
           "lastModifiedTime": "2018-10-10T17:32:28Z",
           "detailedTransferStatus": [
             {
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingAccount.json
index b73b6776d36b..12a70e881d1d 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingAccount.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingAccount.json
@@ -1,9 +1,9 @@
 {
     "parameters": {
-      "api-version": "2018-08-01-preview",
+      "api-version": "2018-11-01-preview",
       "billingAccountName": "{billingAccountName}",
         "parameters": {
-            "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
+            "principalId": "00000000-0000-0000-0000-000000000000",
             "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000"
         }
     },
@@ -12,15 +12,15 @@
             "body": {
                 "value": [
                     {
-                        "id": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
-                        "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
+                        "id": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000",
+                        "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000",
                         "properties": {
                             "createdOn": "2018-06-21T21:34:12.2363515+00:00",
                             "createdByPrincipalTenantId": "7ca289b9-c32d-4f01-8566-7ff93261d76f",
                             "createdByPrincipalId": "",
-                            "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
-                            "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671"
+                            "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000",
+                            "principalId": "00000000-0000-0000-0000-000000000000",
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     },
@@ -33,7 +33,7 @@
                             "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1",
                             "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47",
                             "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671"
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     },
@@ -46,7 +46,7 @@
                             "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47",
                             "name": "10000000-aaaa-bbbb-cccc-100000000002_129db794-64a5-44e0-9838-002780478959",
                             "principalId": "129db794-64a5-44e0-9838-002780478959",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671"
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     },
@@ -59,7 +59,7 @@
                             "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47",
                             "name": "10000000-aaaa-bbbb-cccc-100000000001_d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7",
                             "principalId": "d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671"
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     },
@@ -72,7 +72,7 @@
                             "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47",
                             "name": "10000000-aaaa-bbbb-cccc-100000000000_c4f54fd2-d920-4c49-9b4d-9f09387b881c",
                             "principalId": "c4f54fd2-d920-4c49-9b4d-9f09387b881c",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671"
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingProfile.json
index 53a19d4e1080..38c3c0e86f62 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingProfile.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingProfile.json
@@ -1,10 +1,10 @@
 {
     "parameters": {
-      "api-version": "2018-08-01-preview",
+      "api-version": "2018-11-01-preview",
       "billingAccountName": "{billingAccountName}",
       "billingProfileName": "{billingProfileName}",
         "parameters": {
-            "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
+            "principalId": "00000000-0000-0000-0000-000000000000",
             "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000"
         }
     },
@@ -13,15 +13,15 @@
             "body": {
                 "value": [
                     {
-                        "id": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
-                        "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
+                        "id": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000",
+                        "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000",
                         "properties": {
                             "createdOn": "2018-06-21T21:34:12.2363515+00:00",
                             "createdByPrincipalTenantId": "7ca289b9-c32d-4f01-8566-7ff93261d76f",
                             "createdByPrincipalId": "",
-                            "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
-                            "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/billingProfiles/123/ee4241f3-de74-5631-3e6b-5df2c3d66671"
+                            "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000",
+                            "principalId": "00000000-0000-0000-0000-000000000000",
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToInvoiceSection.json
index c3e4cedd6ec6..fec5048a247b 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToInvoiceSection.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToInvoiceSection.json
@@ -1,10 +1,10 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
+        "api-version": "2018-11-01-preview",
         "billingAccountName": "{billingAccountName}",
         "invoiceSectionName": "{invoiceSectionName}",
         "parameters": {
-            "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
+            "principalId": "00000000-0000-0000-0000-000000000000",
             "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000"
         }
     },
@@ -13,15 +13,15 @@
             "body": {
                 "value": [
                     {
-                        "id": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
-                        "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
+                        "id": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000",
+                        "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000",
                         "properties": {
                             "createdOn": "2018-06-21T21:34:12.2363515+00:00",
                             "createdByPrincipalTenantId": "7ca289b9-c32d-4f01-8566-7ff93261d76f",
                             "createdByPrincipalId": "",
-                            "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
-                            "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/invoiceSections/123/ee4241f3-de74-5631-3e6b-5df2c3d66671"
+                            "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000",
+                            "principalId": "00000000-0000-0000-0000-000000000000",
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementByName.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementByName.json
index 0c666f7588e3..f5be974d81d8 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementByName.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementByName.json
@@ -2,13 +2,13 @@
   "parameters": {
     "api-version": "2018-11-01-preview",
     "billingAccountName": "{billingAccountName}",
-    "agreementName": "Agreement1"
+    "agreementName": "{agreementName}"
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/agreements/Agreement1",
-        "name": "Agreement1",
+        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/agreements/{agreementName}",
+        "name": "{agreementName}",
         "type": "Microsoft.Billing/agreements",
         "properties": {
           "agreementLink": "https://agreementuri1.com",
@@ -22,7 +22,8 @@
             },
             {
               "status": "Declined",
-              "statusDate": "xyz@contoso.com"
+              "statusDate": "2018-11-02T00:00:00Z",
+              "email": "xyz@contoso.com"
             }
           ],
           "status": "Published"
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json
index f3117acc44d1..3059c2dbddd6 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json
@@ -13,7 +13,7 @@
             "type": "Microsoft.Billing/agreements",
             "properties": {
               "agreementLink": "https://agreementuri1.com",
-              "effectiveDate": "2018-12-05T00:00:00Z",              
+              "effectiveDate": "2018-12-05T00:00:00Z",
               "expirationDate": "2018-12-05T00:00:00Z",
               "participants": [
                 {
@@ -23,7 +23,8 @@
                 },
                 {
                   "status": "Declined",
-                  "statusDate": "xyz@contoso.com"
+                  "statusDate": "2018-11-02T00:00:00Z",
+                  "email": "xtz@contoso.com"
                 }
               ],
               "status": "Published"
@@ -35,7 +36,7 @@
             "type": "Microsoft.Billing/agreements",
             "properties": {
               "agreementLink": "https://agreementuri2.com",
-              "effectiveDate": "2018-12-05T00:00:00Z",              
+              "effectiveDate": "2018-12-05T00:00:00Z",
               "expirationDate": "2018-12-05T00:00:00Z",
               "participants": [
                 {
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AvailableBalanceByBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AvailableBalanceByBillingProfile.json
index 2171d5f1eb4e..271afb3da20c 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AvailableBalanceByBillingProfile.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AvailableBalanceByBillingProfile.json
@@ -1,14 +1,14 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "04e9d123-ae03-5621-6c17-e70da00924ee",
-    "billingProfileName": "2291f7a6-e97a-4bb8-83d7-6090beb137e1"
+    "billingAccountName": "{billingAccountName}",
+    "billingProfileName": "{billingProfileName}"
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/billingAccounts/04e9d123-ae03-5621-6c17-e70da00924ee/billingProfiles/2291f7a6-e97a-4bb8-83d7-6090beb137e1/availableBalance/3f2a7a28-985c-4451-8b77-f83f47c3d2c6",
-        "name": "3f2a7a28-985c-4451-8b77-f83f47c3d2c6",
+        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/availableBalance/50000000-0000-0000-0000-000000000000",
+        "name": "50000000-0000-0000-0000-000000000000",
         "type": "Microsoft.Billing/availableBalance",
         "properties": {
           "amount": {
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccount.json
index fb1fa9f87d27..18106a91a4b1 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccount.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccount.json
@@ -1,19 +1,21 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "2000100"
+    "billingAccountName": "{billingAccountName}"
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/billingAccounts/2000100",
-        "name": "2000100",
+        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}",
+        "name": "{billingAccountName}",
         "type": "Microsoft.Billing/billingAccounts",
         "properties": {
           "displayName": "Test Account",
-          "company": "Test Account",
           "accountType": "Organization",
           "address": {
+            "companyName": "Contoso",
+            "firstName": "Test",
+            "lastName": "User",
             "addressLine1": "Test Address",
             "addressLine2": "Test Address",
             "addressLine3": "Test Address",
@@ -22,7 +24,7 @@
             "region": "WA",
             "country": "US"
           },
-          "country": "United States"
+          "hasReadAccess": true
         }
       }
     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountInvoicesList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountInvoicesList.json
index 6539b00edd67..060e32df1bcf 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountInvoicesList.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountInvoicesList.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "2000200",
+    "billingAccountName": "{billingAccountName}",
     "periodStartDate": "2018-01-01",
     "periodEndDate": "2018-06-30",
     "$filter": "invoicePeriodStartDate le 2018-06-01"
@@ -11,7 +11,7 @@
       "body": {
         "value": [
           {
-            "id": "providers/Microsoft.Billing/billingAccounts/2000200/billingProfile/345986/invoices/1383723",
+            "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000/invoices/1383723",
             "name": "1383723",
             "type": "Microsoft.Billing/invoices",
             "properties": {
@@ -28,7 +28,7 @@
               },
               "invoicePeriodStartDate": "2018-01-01T17:32:28Z",
               "invoicePeriodEndDate": "2018-01-15T17:32:28Z",
-              "billingProfile": "345986",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
               "billingProfileName": "Contoso Operations Billing",
               "purchaseOrderNumber": "123456",
               "documentUrls": [
@@ -50,7 +50,7 @@
             }
           },
           {
-            "id": "providers/Microsoft.Billing/billingAccounts/2000200/billingProfile/345987/invoices/1383724",
+            "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000/invoices/1383724",
             "name": "1383724",
             "type": "Microsoft.Billing/invoices",
             "properties": {
@@ -67,7 +67,7 @@
               },
               "invoicePeriodStartDate": "2018-02-01T17:32:28Z",
               "invoicePeriodEndDate": "2018-02-30T17:32:28Z",
-              "billingProfile": "345987",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
               "billingProfileName": "Contoso Operations Billing",
               "purchaseOrderNumber": "123456",
               "documentUrls": [
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountPermissionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountPermissionsList.json
index f0f7e6a73dae..93327d3c9930 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountPermissionsList.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountPermissionsList.json
@@ -1,6 +1,6 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
+        "api-version": "2018-11-01-preview",
         "billingAccountName": "{billingAccountName}"
     },
     "responses": {
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignment.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignment.json
index 43f06a328078..4bad6a2e9971 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignment.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignment.json
@@ -1,6 +1,6 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
+        "api-version": "2018-11-01-preview",
         "billingAccountName": "2000100",
         "billingRoleAssignmentName": "{billingRoleAssignmentId}"
     },
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentDelete.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentDelete.json
index f082c8b3cb71..b1bc04de239d 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentDelete.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentDelete.json
@@ -1,7 +1,7 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100",
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}",
         "billingRoleAssignmentName":"10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9"
     },
     "responses": {
@@ -16,7 +16,7 @@
                     "createdByPrincipalId": "",
                     "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
                     "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
-                    "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671"
+                    "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}"
                 }
             }
         }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentList.json
index bcabd5d600d1..5d2362153324 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentList.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentList.json
@@ -1,7 +1,7 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100"
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}"
     },
     "responses": {
         "200": {
@@ -16,7 +16,7 @@
                             "createdByPrincipalId": "",
                             "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
                             "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671"
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     },
@@ -29,7 +29,7 @@
                             "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1",
                             "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47",
                             "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671"
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinition.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinition.json
index 1d2624c3eeb8..c2aee86ab492 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinition.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinition.json
@@ -1,14 +1,14 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100",
-        "billingRoleDefinitionName": "{billingRoleDefinitionId}"
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}",
+        "billingRoleDefinitionName": "{billingRoleDefinitionName}"
     },
     "responses": {
         "200": {
             "body": {
-                "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000",
-                "name": "10000000-aaaa-bbbb-cccc-100000000000",
+                "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/{billingRoleDefinitionName}",
+                "name": "{billingRoleDefinitionName}",
                 "properties": {
                     "description": "The Owner role gives the user all permissions including access management rights to the Commerce Root.",
                     "permissions": [
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinitionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinitionsList.json
index be3019990e27..559d391a2ce9 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinitionsList.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinitionsList.json
@@ -1,14 +1,14 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100"
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}"
     },
     "responses": {
         "200": {
             "body": {
                 "value": [
                     {
-                        "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000",
+                        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000",
                         "name": "10000000-aaaa-bbbb-cccc-100000000000",
                         "properties": {
                             "description": "The Owner role gives the user all permissions including access management rights to the Commerce Root.",
@@ -44,7 +44,7 @@
                         "type": "Microsoft.Billing/billingRoleDefinitions"
                     },
                     {
-                        "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000001",
+                        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000001",
                         "name": "10000000-aaaa-bbbb-cccc-100000000001",
                         "properties": {
                             "description": "The Contributor role give the user all permissions except access management rights to the Commerce Root.",
@@ -76,7 +76,7 @@
                         "type": "Microsoft.Billing/billingRoleDefinitions"
                     },
                     {
-                        "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000002",
+                        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000002",
                         "name": "10000000-aaaa-bbbb-cccc-100000000002",
                         "properties": {
                             "description": "The Reader role gives the user read only access to the Commerce Root.",
@@ -103,7 +103,7 @@
                         "type": "Microsoft.Billing/billingRoleDefinitions"
                     },
                     {
-                        "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000003",
+                        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000003",
                         "name": "10000000-aaaa-bbbb-cccc-100000000003",
                         "properties": {
                             "description": "The Signatory role can sign agreements on behalf of the customer.",
@@ -121,7 +121,7 @@
                         "type": "Microsoft.Billing/billingRoleDefinitions"
                     },
                     {
-                        "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000004",
+                        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000004",
                         "name": "10000000-aaaa-bbbb-cccc-100000000004",
                         "properties": {
                             "description": "The Basic Purchaser role gives the user the ability to make purchases by creating new Projects and Billing Groups.",
@@ -139,7 +139,7 @@
                         "type": "Microsoft.Billing/billingRoleDefinitions"
                     },
                     {
-                        "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000005",
+                        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000005",
                         "name": "10000000-aaaa-bbbb-cccc-100000000005",
                         "properties": {
                             "description": "The Project Creator role gives the user the ability to create new Projects.",
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountWithExpand.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountWithExpand.json
index 0adf021e55f8..9e45880f4295 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountWithExpand.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountWithExpand.json
@@ -1,19 +1,22 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "2000100",
+    "billingAccountName": "{billingAccountName}",
     "$expand": "invoiceSections, billingProfiles"
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/billingAccounts/2000100",
-        "name": "2000100",
+        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}",
+        "name": "{billingAccountName}",
         "type": "Microsoft.Billing/billingAccounts",
         "properties": {
-          "company": "Test Account",
+          "displayName": "Test Account 1",
           "accountType": "Organization",
           "address": {
+            "companyName": "Contoso",
+            "firstName": "Test",
+            "lastName": "User",
             "addressLine1": "Test Address",
             "addressLine2": "Test Address",
             "addressLine3": "Test Address",
@@ -22,7 +25,7 @@
             "region": "WA",
             "country": "US"
           },
-          "country": "United States",
+          "hasReadAccess": true,
           "invoiceSections": [
             {
               "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1",
@@ -43,22 +46,23 @@
           ],
           "billingProfiles": [
             {
-              "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1",
-              "name": "BillingProfileId1",
+              "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
+              "name": "11000000-0000-0000-0000-000000000000",
               "type": "Microsoft.Billing/billingProfiles",
               "properties": {
-                "displayName": "BillingProfileName1",
-                "poNumber": "ABC12345",
-                "billingAddress": {
-                  "addressLine1": "Test Address",
-                  "addressLine2": "Test Address",
-                  "addressLine3": "Test Address",
+                "displayName": "BillingProfile1",
+                "address": {
+                  "companyName": "Contoso",
+                  "firstName": "Test",
+                  "lastName": "User",
+                  "addressLine1": "Test Address1",
+                  "addressLine2": "Test Address2",
+                  "addressLine3": "Test Address3",
                   "city": "City",
                   "postalCode": "00000",
                   "region": "WA",
                   "country": "US"
                 },
-                "isClassic": false,
                 "currency": "USD",
                 "enabledAzureSKUs": [
                   {
@@ -69,26 +73,31 @@
                     "skuId": "0002",
                     "skuDescription": "Microsoft Azure Standard"
                   }
-                ]
+                ],
+                "isClassic": false,
+                "invoiceDay": 5,
+                "invoiceEmailOptIn": true,
+                "poNumber": "ABC12345"
               }
             },
             {
-              "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId2",
-              "name": "BillingProfileId2",
+              "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000001",
+              "name": "11000000-0000-0000-0000-000000000001",
               "type": "Microsoft.Billing/billingProfiles",
               "properties": {
-                "displayName": "BillingProfileName2",
-                "poNumber": "ABC12345",
-                "billingAddress": {
-                  "addressLine1": "Test Address",
-                  "addressLine2": "Test Address",
-                  "addressLine3": "Test Address",
+                "displayName": "BillingProfile2",
+                "address": {
+                  "companyName": "Contoso",
+                  "firstName": "Test",
+                  "lastName": "User",
+                  "addressLine1": "Test Address1",
+                  "addressLine2": "Test Address2",
+                  "addressLine3": "Test Address3",
                   "city": "City",
                   "postalCode": "00000",
                   "region": "WA",
                   "country": "US"
                 },
-                "isClassic": false,
                 "currency": "USD",
                 "enabledAzureSKUs": [
                   {
@@ -99,7 +108,11 @@
                     "skuId": "0002",
                     "skuDescription": "Microsoft Azure Standard"
                   }
-                ]
+                ],
+                "isClassic": false,
+                "invoiceDay": 5,
+                "invoiceEmailOptIn": true,
+                "poNumber": "ABC12345"
               }
             }
           ]
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsList.json
index bae82490ef61..d272f3d64a3a 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsList.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsList.json
@@ -7,14 +7,16 @@
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/2000100",
-            "name": "2000100",
+            "id": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000",
+            "name": "00000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/billingAccounts",
             "properties": {
-              "displayName": "Test Account",
-              "company": "Test Account1",
+              "displayName": "Test Account 1",
               "accountType": "Organization",
               "address": {
+                "companyName": "Contoso",
+                "firstName": "Test",
+                "lastName": "User",
                 "addressLine1": "Test Address",
                 "addressLine2": "Test Address",
                 "addressLine3": "Test Address",
@@ -23,30 +25,31 @@
                 "region": "WA",
                 "country": "US"
               },
-              "country": "United States"
+              "hasReadAccess": true
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/2000200",
-            "name": "2000200",
+            "id": "/providers/Microsoft.Billing/billingAccounts/10000000-0000-0000-0000-000000000001",
+            "name": "10000000-0000-0000-0000-000000000001",
             "type": "Microsoft.Billing/billingAccounts",
             "properties": {
-              "displayName": "Test Account",
-              "company": "",
+              "displayName": "Test Account 2",
               "accountType": "Organization",
               "address": null,
-              "country": ""
+              "hasReadAccess": false
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/2000300",
-            "name": "2000100",
+            "id": "/providers/Microsoft.Billing/billingAccounts/20000000-0000-0000-0000-000000000002",
+            "name": "20000000-0000-0000-0000-000000000002",
             "type": "Microsoft.Billing/billingAccounts",
             "properties": {
-              "displayName": "Test Account",
-              "company": "Test Account3",
+              "displayName": "Test Account 3",
               "accountType": "Organization",
               "address": {
+                "companyName": "Contoso Test",
+                "firstName": "Test",
+                "lastName": "User",
                 "addressLine1": "Test Address",
                 "addressLine2": "Test Address",
                 "addressLine3": "Test Address",
@@ -55,7 +58,7 @@
                 "region": "WA",
                 "country": "US"
               },
-              "country": "United States"
+              "hasReadAccess": true
             }
           }
         ]
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithCreateInvoiceSectionPermission.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithCreateInvoiceSectionPermission.json
deleted file mode 100644
index 0d35ea598444..000000000000
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithCreateInvoiceSectionPermission.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2018-11-01-preview"
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "value": [
-          {
-            "id": "/providers/Microsoft.Billing/billingAccounts/2000100",
-            "name": "2000100",
-            "type": "Microsoft.Billing/billingAccounts",
-            "properties": {
-              "displayName": "Test Account",
-              "company": "Test Account1",
-              "accountType": "Organization",
-              "address": {
-                "addressLine1": "Test Address",
-                "addressLine2": "Test Address",
-                "addressLine3": "Test Address",
-                "city": "City",
-                "postalCode": "00000",
-                "region": "WA",
-                "country": "US"
-              },
-              "country": "United States"
-            }
-          },
-          {
-            "id": "/providers/Microsoft.Billing/billingAccounts/2000200",
-            "name": "2000200",
-            "type": "Microsoft.Billing/billingAccounts",
-            "properties": {
-              "displayName": "Test Account",
-              "company": "",
-              "accountType": "Organization",
-              "address": null,
-              "country": ""
-            }
-          }
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithExpand.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithExpand.json
index f9d6a55df412..af140a23fbcb 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithExpand.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithExpand.json
@@ -8,14 +8,16 @@
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/2000100",
-            "name": "2000100",
+            "id": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000",
+            "name": "00000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/billingAccounts",
             "properties": {
-              "displayName": "Test Account",
-              "company": "Test Account1",
+              "displayName": "Test Account 1",
               "accountType": "Organization",
               "address": {
+                "companyName": "Contoso",
+                "firstName": "Test",
+                "lastName": "User",
                 "addressLine1": "Test Address",
                 "addressLine2": "Test Address",
                 "addressLine3": "Test Address",
@@ -24,7 +26,7 @@
                 "region": "WA",
                 "country": "US"
               },
-              "country": "United States",
+              "hasReadAccess": true,
               "invoiceSections": [
                 {
                   "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1",
@@ -45,22 +47,23 @@
               ],
               "billingProfiles": [
                 {
-                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1",
-                  "name": "BillingProfileId1",
+                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
+                  "name": "11000000-0000-0000-0000-000000000000",
                   "type": "Microsoft.Billing/billingProfiles",
                   "properties": {
-                    "displayName": "BillingProfileName1",
-                    "poNumber": "ABC12345",
-                    "billingAddress": {
-                      "addressLine1": "Test Address",
-                      "addressLine2": "Test Address",
-                      "addressLine3": "Test Address",
+                    "displayName": "BillingProfile1",
+                    "address": {
+                      "companyName": "Contoso",
+                      "firstName": "Test",
+                      "lastName": "User",
+                      "addressLine1": "Test Address1",
+                      "addressLine2": "Test Address2",
+                      "addressLine3": "Test Address3",
                       "city": "City",
                       "postalCode": "00000",
                       "region": "WA",
                       "country": "US"
                     },
-                    "isClassic": false,
                     "currency": "USD",
                     "enabledAzureSKUs": [
                       {
@@ -71,26 +74,31 @@
                         "skuId": "0002",
                         "skuDescription": "Microsoft Azure Standard"
                       }
-                    ]
+                    ],
+                    "isClassic": false,
+                    "invoiceDay": 5,
+                    "invoiceEmailOptIn": true,
+                    "poNumber": "ABC12345"
                   }
                 },
                 {
-                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId2",
-                  "name": "BillingProfileId2",
+                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000001",
+                  "name": "11000000-0000-0000-0000-000000000001",
                   "type": "Microsoft.Billing/billingProfiles",
                   "properties": {
-                    "displayName": "BillingProfileName2",
-                    "poNumber": "ABC12345",
-                    "billingAddress": {
-                      "addressLine1": "Test Address",
-                      "addressLine2": "Test Address",
-                      "addressLine3": "Test Address",
+                    "displayName": "BillingProfile2",
+                    "address": {
+                      "companyName": "Contoso",
+                      "firstName": "Test",
+                      "lastName": "User",
+                      "addressLine1": "Test Address1",
+                      "addressLine2": "Test Address2",
+                      "addressLine3": "Test Address3",
                       "city": "City",
                       "postalCode": "00000",
                       "region": "WA",
                       "country": "US"
                     },
-                    "isClassic": false,
                     "currency": "USD",
                     "enabledAzureSKUs": [
                       {
@@ -101,22 +109,25 @@
                         "skuId": "0002",
                         "skuDescription": "Microsoft Azure Standard"
                       }
-                    ]
+                    ],
+                    "isClassic": false,
+                    "invoiceDay": 5,
+                    "invoiceEmailOptIn": true,
+                    "poNumber": "ABC12345"
                   }
                 }
               ]
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/2000200",
-            "name": "2000200",
+            "id": "/providers/Microsoft.Billing/billingAccounts/10000000-0000-0000-0000-000000000001",
+            "name": "10000000-0000-0000-0000-000000000001",
             "type": "Microsoft.Billing/billingAccounts",
             "properties": {
-              "displayName": "Test Account",
-              "company": "",
+              "displayName": "Test Account 2",
               "accountType": "Organization",
               "address": null,
-              "country": "",
+              "hasReadAccess": false,
               "invoiceSections": [
                 {
                   "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId3",
@@ -137,22 +148,23 @@
               ],
               "billingProfiles": [
                 {
-                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId3",
-                  "name": "BillingProfileId3",
+                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000004",
+                  "name": "11000000-0000-0000-0000-000000000004",
                   "type": "Microsoft.Billing/billingProfiles",
                   "properties": {
-                    "displayName": "BillingProfileName3",
-                    "poNumber": "ABC12345",
-                    "billingAddress": {
-                      "addressLine1": "Test Address",
-                      "addressLine2": "Test Address",
-                      "addressLine3": "Test Address",
+                    "displayName": "BillingProfile3",
+                    "address": {
+                      "companyName": "Contoso Test",
+                      "firstName": "Test",
+                      "lastName": "User",
+                      "addressLine1": "Test Address1",
+                      "addressLine2": "Test Address2",
+                      "addressLine3": "Test Address3",
                       "city": "City",
                       "postalCode": "00000",
                       "region": "WA",
                       "country": "US"
                     },
-                    "isClassic": false,
                     "currency": "USD",
                     "enabledAzureSKUs": [
                       {
@@ -163,26 +175,31 @@
                         "skuId": "0002",
                         "skuDescription": "Microsoft Azure Standard"
                       }
-                    ]
+                    ],
+                    "isClassic": false,
+                    "invoiceDay": 5,
+                    "invoiceEmailOptIn": true,
+                    "poNumber": "ABC12345"
                   }
                 },
                 {
-                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId4",
-                  "name": "BillingProfileId4",
+                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000005",
+                  "name": "11000000-0000-0000-0000-000000000005",
                   "type": "Microsoft.Billing/billingProfiles",
                   "properties": {
-                    "displayName": "BillingProfileName4",
-                    "poNumber": "ABC12345",
-                    "billingAddress": {
-                      "addressLine1": "Test Address",
-                      "addressLine2": "Test Address",
-                      "addressLine3": "Test Address",
+                    "displayName": "BillingProfile4",
+                    "address": {
+                      "companyName": "Contoso Test",
+                      "firstName": "Test",
+                      "lastName": "User",
+                      "addressLine1": "Test Address1",
+                      "addressLine2": "Test Address2",
+                      "addressLine3": "Test Address3",
                       "city": "City",
                       "postalCode": "00000",
                       "region": "WA",
                       "country": "US"
                     },
-                    "isClassic": false,
                     "currency": "USD",
                     "enabledAzureSKUs": [
                       {
@@ -193,7 +210,11 @@
                         "skuId": "0002",
                         "skuDescription": "Microsoft Azure Standard"
                       }
-                    ]
+                    ],
+                    "isClassic": false,
+                    "invoiceDay": 5,
+                    "invoiceEmailOptIn": true,
+                    "poNumber": "ABC12345"
                   }
                 }
               ]
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfile.json
index 1588313db77f..41e9c6073aac 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfile.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfile.json
@@ -1,29 +1,29 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "2000100",
-    "billingProfileName": "BillingProfileId1"
+    "billingAccountName": "{billingAccountName}",
+    "billingProfileName": "{billingProfileName}"
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1",
-        "name": "BillingProfileId1",
+        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
+        "name": "{billingProfileName}",
         "type": "Microsoft.Billing/billingProfiles",
         "properties": {
-          "displayName": "BillingProfileName1",
-          "poNumber": "ABC12345",
-          "billingAddress": {
-            "addressLine1": "Test Address",
-            "addressLine2": "Test Address",
-            "addressLine3": "Test Address",
+          "displayName": "Billing Profile1",
+          "address": {
+            "companyName": "Contoso",
+            "firstName": "Test",
+            "lastName": "User",
+            "addressLine1": "Test Address1",
+            "addressLine2": "Test Address2",
+            "addressLine3": "Test Address3",
             "city": "City",
             "postalCode": "00000",
             "region": "WA",
             "country": "US"
           },
-          "invoiceEmailOptIn": true,
-          "isClassic": false,
           "currency": "USD",
           "enabledAzureSKUs": [
             {
@@ -34,7 +34,11 @@
               "skuId": "0002",
               "skuDescription": "Microsoft Azure Standard"
             }
-          ]
+          ],
+          "isClassic": false,
+          "invoiceDay": 5,
+          "invoiceEmailOptIn": true,
+          "poNumber": "ABC12345"
         }
       }
     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilePermissionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilePermissionsList.json
index 900de2bbfd55..112fd8bfb785 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilePermissionsList.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilePermissionsList.json
@@ -1,8 +1,8 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100",
-        "billingProfileName": "123"
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}",
+        "billingProfileName": "{billingProfileName}"
     },
     "responses": {
         "200": {
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignment.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignment.json
index 6a250ade8e6a..aa9170349b47 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignment.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignment.json
@@ -1,9 +1,9 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100",
-        "billingProfileName": "123",
-        "billingRoleAssignmentName": "{billingRoleAssignmentId}"
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}",
+        "billingProfileName": "{billingProfileName}",
+        "billingRoleAssignmentName": "{billingRoleAssignmentName}"
     },
     "responses": {
         "200": {
@@ -16,7 +16,7 @@
                     "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1",
                     "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47",
                     "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47",
-                    "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfiles/123"
+                    "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}"
                 },
                 "type": "Microsoft.Billing/billingRoleAssignments"
             }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentDelete.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentDelete.json
index 56e71ff672cb..aa9170349b47 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentDelete.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentDelete.json
@@ -1,9 +1,9 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100",
-        "billingProfileName": "123",
-        "billingRoleAssignmentName": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47"
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}",
+        "billingProfileName": "{billingProfileName}",
+        "billingRoleAssignmentName": "{billingRoleAssignmentName}"
     },
     "responses": {
         "200": {
@@ -16,7 +16,7 @@
                     "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1",
                     "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47",
                     "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47",
-                    "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfiles/123"
+                    "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}"
                 },
                 "type": "Microsoft.Billing/billingRoleAssignments"
             }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentList.json
index 0490007c7637..c6f1d978a078 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentList.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentList.json
@@ -1,7 +1,7 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100",
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}",
         "billingProfileName": "{billingProfileName}"
     },
     "responses": {
@@ -17,20 +17,20 @@
                             "createdByPrincipalId": "",
                             "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
                             "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123"
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     },
                     {
-                        "id": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47",
-                        "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47",
+                        "id": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000",
+                        "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000",
                         "properties": {
                             "createdOn": "2018-06-21T21:58:19.9073876+00:00",
                             "createdByPrincipalTenantId": "7ca289b9-c32d-4f01-8566-7ff93261d76f",
                             "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1",
-                            "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47",
-                            "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123"
+                            "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000",
+                            "principalId": "00000000-0000-0000-0000-000000000000",
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     },
@@ -40,10 +40,10 @@
                         "properties": {
                             "createdOn": "2018-06-22T06:03:51.430844+00:00",
                             "createdByPrincipalTenantId": "7ca289b9-c32d-4f01-8566-7ff93261d76f",
-                            "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47",
+                            "createdByPrincipalId": "00000000-0000-0000-0000-000000000000",
                             "name": "10000000-aaaa-bbbb-cccc-100000000002_129db794-64a5-44e0-9838-002780478959",
                             "principalId": "129db794-64a5-44e0-9838-002780478959",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123"
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     },
@@ -53,10 +53,10 @@
                         "properties": {
                             "createdOn": "2018-07-06T05:52:57.1463874+00:00",
                             "createdByPrincipalTenantId": "7ca289b9-c32d-4f01-8566-7ff93261d76f",
-                            "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47",
+                            "createdByPrincipalId": "00000000-0000-0000-0000-000000000000",
                             "name": "10000000-aaaa-bbbb-cccc-100000000001_d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7",
                             "principalId": "d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123"
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     },
@@ -66,10 +66,10 @@
                         "properties": {
                             "createdOn": "2018-07-10T22:04:33.8309285+00:00",
                             "createdByPrincipalTenantId": "7ca289b9-c32d-4f01-8566-7ff93261d76f",
-                            "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47",
+                            "createdByPrincipalId": "00000000-0000-0000-0000-000000000000",
                             "name": "10000000-aaaa-bbbb-cccc-100000000000_c4f54fd2-d920-4c49-9b4d-9f09387b881c",
                             "principalId": "c4f54fd2-d920-4c49-9b4d-9f09387b881c",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123"
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinition.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinition.json
index 633e68d7ce69..823820a5e0bf 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinition.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinition.json
@@ -1,15 +1,15 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100",
-        "billingProfileName": "123",
-        "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000"
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}",
+        "billingProfileName": "{billingProfileName}",
+        "billingRoleDefinitionName": "{billingRoleDefinitionName}"
     },
     "responses": {
         "200": {
             "body": {
-                "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfiles/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000",
-                "name": "10000000-aaaa-bbbb-cccc-100000000000",
+                "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingRoleDefinitions/{billingRoleDefinitionName}",
+                "name": "{billingRoleDefinitionName}",
                 "properties": {
                     "description": "The Owner role gives the user all permissions including access management rights to the Commerce Root.",
                     "permissions": [
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinitionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinitionsList.json
index 4406dc5e2908..7caae02a7e70 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinitionsList.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinitionsList.json
@@ -1,15 +1,15 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100",
-        "billingProfileName": "123"
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}",
+        "billingProfileName": "{billingProfileName}"
     },
     "responses": {
         "200": {
             "body": {
                 "value": [
                     {
-                        "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfiles/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000",
+                        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000",
                         "name": "10000000-aaaa-bbbb-cccc-100000000000",
                         "properties": {
                             "description": "The Owner role gives the user all permissions including access management rights to the Commerce Root.",
@@ -45,7 +45,7 @@
                         "type": "Microsoft.Billing/billingRoleDefinitions"
                     },
                     {
-                        "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfiles/456/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000001",
+                        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000001",
                         "name": "10000000-aaaa-bbbb-cccc-100000000001",
                         "properties": {
                             "description": "The Contributor role give the user all permissions except access management rights to the Commerce Root.",
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilesListByBillingAccountName.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilesListByBillingAccountName.json
index abe68032e5a2..9f485dad54a5 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilesListByBillingAccountName.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilesListByBillingAccountName.json
@@ -8,23 +8,23 @@
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1",
-            "name": "BillingProfileId1",
+            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
+            "name": "11000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/billingProfiles",
             "properties": {
-              "displayName": "BillingProfileName1",
-              "poNumber": "ABC12345",
-              "billingAddress": {
-                "addressLine1": "Test Address",
-                "addressLine2": "Test Address",
-                "addressLine3": "Test Address",
+              "displayName": "BillingProfile1",
+              "address": {
+                "companyName": "Contoso",
+                "firstName": "Test",
+                "lastName": "User",
+                "addressLine1": "Test Address1",
+                "addressLine2": "Test Address2",
+                "addressLine3": "Test Address3",
                 "city": "City",
                 "postalCode": "00000",
                 "region": "WA",
                 "country": "US"
               },
-              "invoiceEmailOptIn": true,
-              "isClassic": false,
               "currency": "USD",
               "enabledAzureSKUs": [
                 {
@@ -35,27 +35,31 @@
                   "skuId": "0002",
                   "skuDescription": "Microsoft Azure Standard"
                 }
-              ]
+              ],
+              "isClassic": false,
+              "invoiceDay": 5,
+              "invoiceEmailOptIn": true,
+              "poNumber": "ABC12345"
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileName2",
-            "name": "BillingProfileName2",
+            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000001",
+            "name": "11000000-0000-0000-0000-000000000001",
             "type": "Microsoft.Billing/billingProfiles",
             "properties": {
-              "displayName": "BillingProfileName2",
-              "poNumber": "ABC12345",
-              "billingAddress": {
-                "addressLine1": "Test Address",
-                "addressLine2": "Test Address",
-                "addressLine3": "Test Address",
+              "displayName": "BillingProfile2",
+              "address": {
+                "companyName": "Contoso",
+                "firstName": "Test",
+                "lastName": "User",
+                "addressLine1": "Test Address1",
+                "addressLine2": "Test Address2",
+                "addressLine3": "Test Address3",
                 "city": "City",
                 "postalCode": "00000",
                 "region": "WA",
                 "country": "US"
               },
-              "invoiceEmailOptIn": true,
-              "isClassic": false,
               "currency": "USD",
               "enabledAzureSKUs": [
                 {
@@ -66,7 +70,11 @@
                   "skuId": "0002",
                   "skuDescription": "Microsoft Azure Standard"
                 }
-              ]
+              ],
+              "isClassic": false,
+              "invoiceDay": 5,
+              "invoiceEmailOptIn": true,
+              "poNumber": "ABC12345"
             }
           }
         ]
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProperty.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProperty.json
index c37e1dda02ee..712e2ac42132 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProperty.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProperty.json
@@ -1,21 +1,28 @@
 {
   "parameters": {
-    "api-version": "2018-11-01",
-    "subscriptionId": "300de4e3-b973-4d69-8b57-da07971b4280"
+    "api-version": "2018-11-01-preview",
+    "subscriptionId": "{subscriptionId}"
   },
   "responses": {
     "200": {
       "body": {
-          "productId": "providers/Microsoft.Billing/billingAccounts/ec4e5646-246e-47db-936e-34b91bf3e7d4/invoiceSections/c8c5a313-35d3-44fd-a41b-3629b71a3d1a/products/56bab771-3a48-45c9-a675-3e70fbd82874",
-          "billingTenantId": "97d90bbc-69ce-4e8b-bf18-a2d439079d15",
-          "billingAccountId": "providers/Microsoft.Billing/billingAccounts/ec4e5646-246e-47db-936e-34b91bf3e7d4",
+        "id": "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingProperty/default",
+        "name": "default",
+        "type": "Microsoft.Billing/billingProperty",
+        "properties": {
+          "billingTenantId": "90000000-0000-0000-0000-000000000011",
+          "billingAccountId": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000",
           "billingAccountName": "My Account",
-          "invoiceSectionId": "providers/Microsoft.Billing/billingAccounts/ec4e5646-246e-47db-936e-34b91bf3e7d4/invoiceSections/c8c5a313-35d3-44fd-a41b-3629b71a3d1a",
-          "invoiceSectionName": "Contoso operations invoice section",
-          "billingProfileId": "providers/Microsoft.Billing/billingAccounts/ec4e5646-246e-47db-936e-34b91bf3e7d4/billingProfiles/b1f996ea-d439-4e63-a8c6-2f9c86c7eafb",
+          "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000/billingProfiles/11000000-0000-0000-0000-000000000000",
           "billingProfileName": "Contoso operations billing",
+          "costCenter": "1010",
+          "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000/invoiceSections/22000000-0000-0000-0000-000000000000",
+          "invoiceSectionName": "Contoso operations invoice section",
+          "productId": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000/invoiceSections/22000000-0000-0000-0000-000000000000/products/44000000-0000-0000-0000-000000000000",
+          "productName": "Standard Dev",
           "skuId": "0001",
           "skuDescription": "Microsoft Azure Standard"
+        }
       }
     }
   }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscription.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscription.json
index 048ba48b068a..d9b3fac7f4e2 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscription.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscription.json
@@ -1,37 +1,33 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "1234",
-    "invoiceSectionName": "12345",
-    "billingSubscriptionName": "billinSubscriptionId1",
+    "billingAccountName": "{billingAccountName}",
+    "invoiceSectionName": "{invoiceSectionName}",
+    "billingSubscriptionName": "{billingSubscriptionName}",
     "$expand": "billingProfile"
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/BillingAccounts/1234/invoiceSections/12345/billingSubscriptions/billinSubscriptionId1",
-        "name": "billinSubscriptionId1",
+        "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/{billingSubscriptionName}",
+        "name": "{billingSubscriptionName}",
         "type": "Microsoft.Billing/billingSubscriptions",
         "properties": {
-          "displayName": "AIP Dev",
+          "displayName": "My Subscription",
           "subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3",
           "subscriptionBillingStatus": "Active",
-          "monthToDateCharges": {
-            "currency": "USD",
-            "value": 1000.00
-          },
           "lastMonthCharges": {
             "currency": "USD",
             "value": 5000.00
           },
-          "enrollmentAccountContext": {
-            "costCenter": "Cost center A",
-            "startDate": "2018-05-01T17:32:28Z",
-            "endDate": "2018-05-01T17:32:28Z",
-            "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345"
+          "monthToDateCharges": {
+            "currency": "USD",
+            "value": 600
           },
-          "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId3",
-          "billingProfileName": "BillingProfileId3",
+          "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}",
+          "invoiceSectionName": "Contoso operations invoiceSection",
+          "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
+          "billingProfileName": "Contoso operations billing",
           "skuId": "0001",
           "skuDescription": "Microsoft Azure Dev/Test"
         }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingAccount.json
index a42f6e093fea..769c6589d993 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingAccount.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingAccount.json
@@ -1,99 +1,86 @@
 {
-    "parameters": {
-        "api-version": "2018-11-01-preview",
-        "billingAccountName": "1234",
-        "$expand": "billingProfile"
-    },
-    "responses": {
-        "200": {
-            "body": {
-                "value": [
-                    {
-                        "id": "/providers/Microsoft.Billing/BillingAccounts/1234/invoiceSections/12345/billingSubscriptions/billinSubscriptionId1",
-                        "name": "billinSubscriptionId1",
-                        "type": "Microsoft.Billing/billingSubscriptions",
-                        "properties": {
-                            "displayName": "AIP Dev",
-                            "subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3",
-                            "subscriptionBillingStatus": "Active",
-                            "monthToDateCharges": {
-                                "currency": "USD",
-                                "value": 1000.00
-                            },
-                            "lastMonthCharges": {
-                                "currency": "USD",
-                                "value": 5000.00
-                            },
-                            "enrollmentAccountContext": {
-                                "costCenter": "Cost center A",
-                                "startDate": "2018-05-01T17:32:28Z",
-                                "endDate": "2018-05-01T17:32:28Z",
-                                "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345"
-                            },
-                            "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1",
-                            "billingProfileName": "BillingProfileId1",
-                            "skuId": "0001",
-                            "skuDescription": "Microsoft Azure Dev/Test"
-                        }
-                    },
-                    {
-                        "id": "/providers/Microsoft.Billing/BillingAccounts/1234/invoiceSections/12345/billingSubscriptions/billinSubscriptionId2",
-                        "name": "billinSubscriptionId2",
-                        "type": "Microsoft.Billing/billingSubscriptions",
-                        "properties": {
-                            "displayName": "AIP Int",
-                            "subscriptionId": "6b96d3f2-9008-4a9d-912f-6b96d3f2",
-                            "subscriptionBillingStatus": "Active",
-                            "monthToDateCharges": {
-                                "currency": "USD",
-                                "value": 2000.00
-                            },
-                            "lastMonthCharges": {
-                                "currency": "USD",
-                                "value": 1000.00
-                            },
-                            "enrollmentAccountContext": {
-                                "costCenter": "Cost center A",
-                                "startDate": "2018-05-01T17:32:28Z",
-                                "endDate": "2018-05-01T17:32:28Z",
-                                "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345"
-                            },
-                            "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId2",
-                            "billingProfileName": "BillingProfileId2",
-                            "skuId": "0001",
-                            "skuDescription": "Microsoft Azure Dev/Test"
-                        }
-                    },
-                    {
-                        "id": "/providers/Microsoft.Billing/BillingAccounts/1234/invoiceSections/12345/billingSubscriptions/billinSubscriptionId3",
-                        "name": "billinSubscriptionId3",
-                        "type": "Microsoft.Billing/billingSubscriptions",
-                        "properties": {
-                            "displayName": "AIP Prod",
-                            "subscriptionId": "6b96d3f2-4a9d-9008-912f-f87744185aa3",
-                            "subscriptionBillingStatus": "Active",
-                            "monthToDateCharges": {
-                                "currency": "USD",
-                                "value": 4000.00
-                            },
-                            "lastMonthCharges": {
-                                "currency": "USD",
-                                "value": 6000.00
-                            },
-                            "enrollmentAccountContext": {
-                                "costCenter": "Cost center A",
-                                "startDate": "2018-05-01T17:32:28Z",
-                                "endDate": "2018-05-01T17:32:28Z",
-                                "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345"
-                            },
-                            "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId3",
-                            "billingProfileName": "BillingProfileId3",
-                            "skuId": "0001",
-                            "skuDescription": "Microsoft Azure Dev/Test"
-                        }
-                    }
-                ]
+  "parameters": {
+    "api-version": "2018-11-01-preview",
+    "billingAccountName": "{billingAccountName}"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/90000000-0000-0000-0000-000000000000",
+            "name": "90000000-0000-0000-0000-000000000000",
+            "type": "Microsoft.Billing/billingSubscriptions",
+            "properties": {
+              "displayName": "My subscription",
+              "subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3",
+              "subscriptionBillingStatus": "Active",
+              "lastMonthCharges": {
+                "currency": "USD",
+                "value": 5000.00
+              },
+              "monthToDateCharges": {
+                "currency": "USD",
+                "value": 600
+              },
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
+              "invoiceSectionName": "Contoso operations invoiceSection",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
+              "billingProfileName": "Contoso operations billing",
+              "skuId": "0001",
+              "skuDescription": "Microsoft Azure Dev/Test"
             }
-        }
+          },
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/90000000-0000-0000-0000-000000000001",
+            "name": "90000000-0000-0000-0000-000000000001",
+            "type": "Microsoft.Billing/billingSubscriptions",
+            "properties": {
+              "displayName": "Test subscription",
+              "subscriptionId": "6b96d3f2-9008-4a9d-912f-6b96d3f2",
+              "subscriptionBillingStatus": "Active",
+              "lastMonthCharges": {
+                "currency": "USD",
+                "value": 1000.00
+              },
+              "monthToDateCharges": {
+                "currency": "USD",
+                "value": 400
+              },
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
+              "invoiceSectionName": "Contoso operations invoiceSection",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
+              "billingProfileName": "Contoso operations billing",
+              "skuId": "0001",
+              "skuDescription": "Microsoft Azure Dev/Test"
+            }
+          },
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/90000000-0000-0000-0000-000000000002",
+            "name": "90000000-0000-0000-0000-000000000002",
+            "type": "Microsoft.Billing/billingSubscriptions",
+            "properties": {
+              "displayName": "Dev Subscription",
+              "subscriptionId": "6b96d3f2-4a9d-9008-912f-f87744185aa3",
+              "subscriptionBillingStatus": "Active",
+              "lastMonthCharges": {
+                "currency": "USD",
+                "value": 6000.00
+              },
+              "monthToDateCharges": {
+                "currency": "USD",
+                "value": 900
+              },
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
+              "invoiceSectionName": "Contoso operations invoiceSection",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
+              "billingProfileName": "Contoso operations billing",
+              "skuId": "0001",
+              "skuDescription": "Microsoft Azure Dev/Test"
+            }
+          }
+        ]
+      }
     }
+  }
 }
\ No newline at end of file
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingProfile.json
index 64db962cbe55..32c552439480 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingProfile.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingProfile.json
@@ -1,100 +1,87 @@
 {
-    "parameters": {
-        "api-version": "2018-11-01-preview",
-        "billingAccountName": "{billingAccountName}",
-        "billingProfileName": "{BillingProfileId}",
-        "$expand": "billingProfile"
-    },
-    "responses": {
-        "200": {
-            "body": {
-                "value": [
-                    {
-                        "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/12345/billingSubscriptions/billinSubscriptionId1",
-                        "name": "billinSubscriptionId1",
-                        "type": "Microsoft.Billing/billingSubscriptions",
-                        "properties": {
-                            "displayName": "AIP Dev",
-                            "subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3",
-                            "subscriptionBillingStatus": "Active",
-                            "monthToDateCharges": {
-                                "currency": "USD",
-                                "value": 1000.00
-                            },
-                            "lastMonthCharges": {
-                                "currency": "USD",
-                                "value": 5000.00
-                            },
-                            "enrollmentAccountContext": {
-                                "costCenter": "Cost center A",
-                                "startDate": "2018-05-01T17:32:28Z",
-                                "endDate": "2018-05-01T17:32:28Z",
-                                "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345"
-                            },
-                            "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{BillingProfileId}",
-                            "billingProfileName": "{BillingProfileId}",
-                            "skuId": "0001",
-                            "skuDescription": "Microsoft Azure Dev/Test"
-                        }
-                    },
-                    {
-                        "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/12345/billingSubscriptions/billinSubscriptionId2",
-                        "name": "billinSubscriptionId2",
-                        "type": "Microsoft.Billing/billingSubscriptions",
-                        "properties": {
-                            "displayName": "AIP Int",
-                            "subscriptionId": "6b96d3f2-9008-4a9d-912f-6b96d3f2",
-                            "subscriptionBillingStatus": "Active",
-                            "monthToDateCharges": {
-                                "currency": "USD",
-                                "value": 2000.00
-                            },
-                            "lastMonthCharges": {
-                                "currency": "USD",
-                                "value": 1000.00
-                            },
-                            "enrollmentAccountContext": {
-                                "costCenter": "Cost center A",
-                                "startDate": "2018-05-01T17:32:28Z",
-                                "endDate": "2018-05-01T17:32:28Z",
-                                "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345"
-                            },
-                            "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{BillingProfileId}",
-                            "billingProfileName": "{BillingProfileId}",
-                            "skuId": "0001",
-                            "skuDescription": "Microsoft Azure Dev/Test"
-                        }
-                    },
-                    {
-                        "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/12345/billingSubscriptions/billinSubscriptionId3",
-                        "name": "billinSubscriptionId3",
-                        "type": "Microsoft.Billing/billingSubscriptions",
-                        "properties": {
-                            "displayName": "AIP Prod",
-                            "subscriptionId": "6b96d3f2-4a9d-9008-912f-f87744185aa3",
-                            "subscriptionBillingStatus": "Active",
-                            "monthToDateCharges": {
-                                "currency": "USD",
-                                "value": 4000.00
-                            },
-                            "lastMonthCharges": {
-                                "currency": "USD",
-                                "value": 6000.00
-                            },
-                            "enrollmentAccountContext": {
-                                "costCenter": "Cost center A",
-                                "startDate": "2018-05-01T17:32:28Z",
-                                "endDate": "2018-05-01T17:32:28Z",
-                                "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345"
-                            },
-                            "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{BillingProfileId}",
-                            "billingProfileName": "{BillingProfileId}",
-                            "skuId": "0001",
-                            "skuDescription": "Microsoft Azure Dev/Test"
-                        }
-                    }
-                ]
+  "parameters": {
+    "api-version": "2018-11-01-preview",
+    "billingAccountName": "{billingAccountName}",
+    "billingProfileName": "{billingProfileName}"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId1",
+            "name": "billingSubscriptionId1",
+            "type": "Microsoft.Billing/billingSubscriptions",
+            "properties": {
+              "displayName": "My subscription",
+              "subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3",
+              "subscriptionBillingStatus": "Active",
+              "lastMonthCharges": {
+                "currency": "USD",
+                "value": 5000.00
+              },
+              "monthToDateCharges": {
+                "currency": "USD",
+                "value": 600
+              },
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
+              "invoiceSectionName": "Contoso operations invoiceSection",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
+              "billingProfileName": "Contoso operations billing",
+              "skuId": "0001",
+              "skuDescription": "Microsoft Azure Dev/Test"
             }
-        }
+          },
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId2",
+            "name": "billingSubscriptionId2",
+            "type": "Microsoft.Billing/billingSubscriptions",
+            "properties": {
+              "displayName": "Test subscription",
+              "subscriptionId": "6b96d3f2-9008-4a9d-912f-6b96d3f2",
+              "subscriptionBillingStatus": "Active",
+              "lastMonthCharges": {
+                "currency": "USD",
+                "value": 1000.00
+              },
+              "monthToDateCharges": {
+                "currency": "USD",
+                "value": 400
+              },
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
+              "invoiceSectionName": "Contoso operations invoiceSection",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
+              "billingProfileName": "Contoso operations billing",
+              "skuId": "0001",
+              "skuDescription": "Microsoft Azure Dev/Test"
+            }
+          },
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId3",
+            "name": "billingSubscriptionId3",
+            "type": "Microsoft.Billing/billingSubscriptions",
+            "properties": {
+              "displayName": "Dev Subscription",
+              "subscriptionId": "6b96d3f2-4a9d-9008-912f-f87744185aa3",
+              "subscriptionBillingStatus": "Active",
+              "lastMonthCharges": {
+                "currency": "USD",
+                "value": 6000.00
+              },
+              "monthToDateCharges": {
+                "currency": "USD",
+                "value": 900
+              },
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
+              "invoiceSectionName": "Contoso operations invoiceSection",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
+              "billingProfileName": "Contoso operations billing",
+              "skuId": "0001",
+              "skuDescription": "Microsoft Azure Dev/Test"
+            }
+          }
+        ]
+      }
     }
+  }
 }
\ No newline at end of file
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByInvoiceSection.json
index 75905239f422..7f0c000cd7c7 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByInvoiceSection.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByInvoiceSection.json
@@ -1,100 +1,87 @@
 {
-    "parameters": {
-        "api-version": "2018-11-01-preview",
-        "billingAccountName": "1234",
-        "invoiceSectionName": "12345",
-        "$expand": "billingProfile"
-    },
-    "responses": {
-        "200": {
-            "body": {
-                "value": [
-                    {
-                        "id": "/providers/Microsoft.Billing/BillingAccounts/1234/invoiceSections/12345/billingSubscriptions/billinSubscriptionId1",
-                        "name": "billinSubscriptionId1",
-                        "type": "Microsoft.Billing/billingSubscriptions",
-                        "properties": {
-                            "displayName": "AIP Dev",
-                            "subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3",
-                            "subscriptionBillingStatus": "Active",
-                            "monthToDateCharges": {
-                                "currency": "USD",
-                                "value": 1000.00
-                            },
-                            "lastMonthCharges": {
-                                "currency": "USD",
-                                "value": 5000.00
-                            },
-                            "enrollmentAccountContext": {
-                                "costCenter": "Cost center A",
-                                "startDate": "2018-05-01T17:32:28Z",
-                                "endDate": "2018-05-01T17:32:28Z",
-                                "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345"
-                            },
-                            "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1",
-                            "billingProfileName": "BillingProfileId1",
-                            "skuId": "0001",
-                            "skuDescription": "Microsoft Azure Dev/Test"
-                        }
-                    },
-                    {
-                        "id": "/providers/Microsoft.Billing/BillingAccounts/1234/invoiceSections/12345/billingSubscriptions/billinSubscriptionId2",
-                        "name": "billinSubscriptionId2",
-                        "type": "Microsoft.Billing/billingSubscriptions",
-                        "properties": {
-                            "displayName": "AIP Int",
-                            "subscriptionId": "6b96d3f2-9008-4a9d-912f-6b96d3f2",
-                            "subscriptionBillingStatus": "Active",
-                            "monthToDateCharges": {
-                                "currency": "USD",
-                                "value": 2000.00
-                            },
-                            "lastMonthCharges": {
-                                "currency": "USD",
-                                "value": 1000.00
-                            },
-                            "enrollmentAccountContext": {
-                                "costCenter": "Cost center A",
-                                "startDate": "2018-05-01T17:32:28Z",
-                                "endDate": "2018-05-01T17:32:28Z",
-                                "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345"
-                            },
-                            "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId2",
-                            "billingProfileName": "BillingProfileId2",
-                            "skuId": "0001",
-                            "skuDescription": "Microsoft Azure Dev/Test"
-                        }
-                    },
-                    {
-                        "id": "/providers/Microsoft.Billing/BillingAccounts/1234/invoiceSections/12345/billingSubscriptions/billinSubscriptionId3",
-                        "name": "billinSubscriptionId3",
-                        "type": "Microsoft.Billing/billingSubscriptions",
-                        "properties": {
-                            "displayName": "AIP Prod",
-                            "subscriptionId": "6b96d3f2-4a9d-9008-912f-f87744185aa3",
-                            "subscriptionBillingStatus": "Active",
-                            "monthToDateCharges": {
-                                "currency": "USD",
-                                "value": 4000.00
-                            },
-                            "lastMonthCharges": {
-                                "currency": "USD",
-                                "value": 6000.00
-                            },
-                            "enrollmentAccountContext": {
-                                "costCenter": "Cost center A",
-                                "startDate": "2018-05-01T17:32:28Z",
-                                "endDate": "2018-05-01T17:32:28Z",
-                                "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345"
-                            },
-                            "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId3",
-                            "billingProfileName": "BillingProfileId3",
-                            "skuId": "0001",
-                            "skuDescription": "Microsoft Azure Dev/Test"
-                        }
-                    }
-                ]
+  "parameters": {
+    "api-version": "2018-11-01-preview",
+    "billingAccountName": "{billingAccountName}",
+    "invoiceSectionName": "{invoiceSectionName}"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/billinSubscriptionId1",
+            "name": "billingSubscriptionId1",
+            "type": "Microsoft.Billing/billingSubscriptions",
+            "properties": {
+              "displayName": "My subscription",
+              "subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3",
+              "subscriptionBillingStatus": "Active",
+              "lastMonthCharges": {
+                "currency": "USD",
+                "value": 5000.00
+              },
+              "monthToDateCharges": {
+                "currency": "USD",
+                "value": 600
+              },
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}",
+              "invoiceSectionName": "Contoso operations invoiceSection",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
+              "billingProfileName": "Contoso operations billing",
+              "skuId": "0001",
+              "skuDescription": "Microsoft Azure Dev/Test"
             }
-        }
+          },
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/billinSubscriptionId2",
+            "name": "billingSubscriptionId2",
+            "type": "Microsoft.Billing/billingSubscriptions",
+            "properties": {
+              "displayName": "Test subscription",
+              "subscriptionId": "6b96d3f2-9008-4a9d-912f-6b96d3f2",
+              "subscriptionBillingStatus": "Active",
+              "lastMonthCharges": {
+                "currency": "USD",
+                "value": 1000.00
+              },
+              "monthToDateCharges": {
+                "currency": "USD",
+                "value": 400
+              },
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}",
+              "invoiceSectionName": "Contoso operations invoiceSection",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
+              "billingProfileName": "Contoso operations billing",
+              "skuId": "0001",
+              "skuDescription": "Microsoft Azure Dev/Test"
+            }
+          },
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/billinSubscriptionId3",
+            "name": "billingSubscriptionId3",
+            "type": "Microsoft.Billing/billingSubscriptions",
+            "properties": {
+              "displayName": "Dev Subscription",
+              "subscriptionId": "6b96d3f2-4a9d-9008-912f-f87744185aa3",
+              "subscriptionBillingStatus": "Active",
+              "lastMonthCharges": {
+                "currency": "USD",
+                "value": 6000.00
+              },
+              "monthToDateCharges": {
+                "currency": "USD",
+                "value": 900
+              },
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}",
+              "invoiceSectionName": "Contoso operations invoiceSection",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
+              "billingProfileName": "Contoso operations billing",
+              "skuId": "0001",
+              "skuDescription": "Microsoft Azure Dev/Test"
+            }
+          }
+        ]
+      }
     }
+  }
 }
\ No newline at end of file
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CancelTransfer.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CancelTransfer.json
index 60e09fbf9941..7fc6cc54eed7 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CancelTransfer.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CancelTransfer.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2018-08-01-preview",
+    "api-version": "2018-11-01-preview",
     "billingAccountName": "billingAccountName",
     "invoiceSectionName": "invoiceSectionName",
     "transferName": "transferName"
@@ -16,7 +16,7 @@
           "billingAccountId": "billingAccountName",
           "transferStatus": "Pending",
           "recipientEmailId": "user@contoso.com",
-          "initiatorEmailId": "user@contoso.com",
+          "initiatorEmailId": "xyz@contoso.com",
           "canceledBy": "user@contoso.com",
           "lastModifiedTime": "2018-10-10T17:32:28Z"
         }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CreateInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CreateInvoiceSection.json
index 9cf8ebb91252..2acd4cf61696 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CreateInvoiceSection.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CreateInvoiceSection.json
@@ -3,25 +3,26 @@
     "api-version": "2018-11-01-preview",
     "billingAccountName": "{billingAccountName}",
     "parameters": {
-      "displayName": "invoiceSectionName1",
+      "displayName": "invoiceSection1",
       "billingProfiles": [
         {
-          "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1",
-          "name": "BillingProfileId1",
+          "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
+          "name": "11000000-0000-0000-0000-000000000000",
           "type": "Microsoft.Billing/billingProfiles",
           "properties": {
-            "displayName": "BillingProfileName1",
-            "poNumber": "ABC12345",
-            "billingAddress": {
-              "addressLine1": "Test Address",
-              "addressLine2": "Test Address",
-              "addressLine3": "Test Address",
+            "displayName": "BillingProfile1",
+            "address": {
+              "companyName": "Contoso",
+              "firstName": "Test",
+              "lastName": "User",
+              "addressLine1": "Test Address1",
+              "addressLine2": "Test Address2",
+              "addressLine3": "Test Address3",
               "city": "City",
               "postalCode": "00000",
               "region": "WA",
               "country": "US"
             },
-            "isClassic": false,
             "currency": "USD",
             "enabledAzureSKUs": [
               {
@@ -32,7 +33,11 @@
                 "skuId": "0002",
                 "skuDescription": "Microsoft Azure Standard"
               }
-            ]
+            ],
+            "isClassic": false,
+            "invoiceDay": 5,
+            "invoiceEmailOptIn": true,
+            "poNumber": "ABC12345"
           }
         }
       ]
@@ -52,7 +57,7 @@
         "name": "invoiceSectionId1",
         "type": "Microsoft.Billing/invoiceSections",
         "properties": {
-          "displayName": "invoiceSectionName1"
+          "displayName": "invoiceSection1"
         }
       }
     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DeclineTransfer.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DeclineTransfer.json
index 16b13bc4ae9d..1e2e37da894d 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DeclineTransfer.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DeclineTransfer.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2018-08-01-preview",
+    "api-version": "2018-11-01-preview",
     "transferName": "transferName"
   },
 
@@ -12,7 +12,7 @@
           "expirationTime": "2018-11-05T17:32:28Z",
           "transferStatus": "Declined",
           "recipientEmailId": "user@contoso.com",
-          "initiatorEmailId": "user@contoso.com",
+          "initiatorEmailId": "xyz@contoso.com",
           "lastModifiedTime": "2018-10-10T17:32:28Z"
         }
       }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Department.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Department.json
index ae9d6941bd70..f99c70fca3ed 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Department.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Department.json
@@ -2,16 +2,16 @@
 	"parameters": {
 		"api-version": "2018-11-01-preview",
 		"billingAccountName": "{billingAccountName}",
-		"departmentName": "{departmentId1}"
+		"departmentName": "{departmentName}"
 	},
 	"responses": {
 		"200": {
 			"body": {
-				"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/departmentId1",
-				"name": "departmentId1",
+				"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/{departmentName}",
+				"name": "{departmentName}",
 				"type": "Microsoft.Billing/departments",
 				"properties": {
-					"departmentName": "departmentName1",
+					"departmentName": "Test department",
 					"costCenter": "C1",
 					"status": "Active"
 				}
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentWithExpand.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentWithExpand.json
index b197be83d360..692eab97f467 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentWithExpand.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentWithExpand.json
@@ -2,14 +2,14 @@
 	"parameters": {
 		"api-version": "2018-11-01-preview",
 		"billingAccountName": "{billingAccountName}",
-		"departmentName": "{departmentId}",
+		"departmentName": "{departmentName}",
 		"$expand": "properties/enrollmentAccounts"
 	},
 	"responses": {
 		"200": {
 			"body": {
-				"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/departmentId1",
-				"name": "departmentId1",
+				"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/{departmentName}",
+				"name": "{departmentName}",
 				"type": "Microsoft.Billing/departments",
 				"properties": {
 					"departmentName": "departmentName1",
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ElevateInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ElevateInvoiceSection.json
index 7993bc6e1840..1a5d91230f4e 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ElevateInvoiceSection.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ElevateInvoiceSection.json
@@ -1,8 +1,8 @@
 {
   "parameters": {
-    "api-version": "2018-08-01-preview",
-    "billingAccountName": "billingAccountName",
-    "invoiceSectionName": "invoiceSectionName"
+    "api-version": "2018-11-01-preview",
+    "billingAccountName": "{billingAccountName}",
+    "invoiceSectionName": "{invoiceSectionName}"
   },
 
   "responses": {
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccount.json
index 1cef16310673..d71d36ec19be 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccount.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccount.json
@@ -7,8 +7,8 @@
 	"responses": {
 		"200": {
 			"body": {
-				"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId0",
-				"name": "accountId0",
+				"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/{enrollmentAccountName}",
+				"name": "{enrollmentAccountName}",
 				"type": "Microsoft.Billing/enrollmentAccounts",
 				"properties": {
 					"accountName": "AccountName0",
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountWithExpand.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountWithExpand.json
index d8ee2bdc49ac..e742417a737e 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountWithExpand.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountWithExpand.json
@@ -8,8 +8,8 @@
 	"responses": {
 		"200": {
 			"body": {
-				"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId0",
-				"name": "accountId0",
+				"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/{enrollmentAccountName}",
+				"name": "{enrollmentAccountName}",
 				"type": "Microsoft.Billing/enrollmentAccounts",
 				"properties": {
 					"accountName": "AccountName0",
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetRecipientTransfer.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetRecipientTransfer.json
index 9c6ec50284bd..26454fb930c6 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetRecipientTransfer.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetRecipientTransfer.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2018-08-01-preview",
+    "api-version": "2018-11-01-preview",
     "transferName": "transferName"
   },
 
@@ -12,7 +12,7 @@
           "expirationTime": "2018-11-05T17:32:28Z",
           "transferStatus": "InProgress",
           "recipientEmailId": "user@contoso.com",
-          "initiatorEmailId": "user@contoso.com",
+          "initiatorEmailId": "xyz@contoso.com",
           "lastModifiedTime": "2018-10-10T17:32:28Z",
           "detailedTransferStatus": [
             {
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetTransfer.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetTransfer.json
index 748f82827a51..124cc60f1734 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetTransfer.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetTransfer.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2018-08-01-preview",
+    "api-version": "2018-11-01-preview",
     "billingAccountName": "billingAccountName",
     "invoiceSectionName": "invoiceSectionName",
     "transferName": "transferName"
@@ -16,7 +16,7 @@
           "billingAccountId": "billingAccountName",
           "transferStatus": "InProgress",
           "recipientEmailId": "user@contoso.com",
-          "initiatorEmailId": "user@contoso.com",
+          "initiatorEmailId": "xyz@contoso.com",
           "lastModifiedTime": "2018-10-10T17:32:28Z",
           "detailedTransferStatus": [
             {
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InitiateTransfer.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InitiateTransfer.json
index 749fc758ec1b..160d7ab592ea 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InitiateTransfer.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InitiateTransfer.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2018-08-01-preview",
+    "api-version": "2018-11-01-preview",
     "billingAccountName": "billingAccountName",
     "invoiceSectionName": "invoiceSectionName",
     "body": {
@@ -22,7 +22,7 @@
           "billingAccountId": "billingAccountName",
           "transferStatus": "Pending",
           "recipientEmailId": "user@contoso.com",
-          "initiatorEmailId": "user@contoso.com",
+          "initiatorEmailId": "xyz@contoso.com",
           "lastModifiedTime": "2018-10-10T17:32:28Z"
         }
       }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Invoice.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Invoice.json
index 5be090ec4ec5..3e0a5aeab86e 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Invoice.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Invoice.json
@@ -1,15 +1,15 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "2000200",
-    "billingProfileName": "345986",
-    "invoiceName": "1383723"
+    "billingAccountName": "{billingAccountName}",
+    "billingProfileName": "{billingProfileName}",
+    "invoiceName": "{invoiceName}"
   },
   "responses": {
     "200": {
       "body": {
-        "id": "providers/Microsoft.Billing/billingAccounts/2000200/billingProfile/345986/invoices/1383723",
-        "name": "1383723",
+        "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoices/{invoiceName}",
+        "name": "{invoiceName}",
         "type": "Microsoft.Billing/invoices",
         "properties": {
           "dueDate": "2018-01-16T17:32:28Z",
@@ -25,6 +25,7 @@
           },
           "invoicePeriodStartDate": "2018-01-01T17:32:28Z",
           "invoicePeriodEndDate": "2018-01-15T17:32:28Z",
+          "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
           "billingProfileName": "Contoso Operations Billing",
           "purchaseOrderNumber": "123456",
           "documentUrls": [
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSection.json
index b98850157ef0..4908a6ec6609 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSection.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSection.json
@@ -2,16 +2,16 @@
   "parameters": {
     "api-version": "2018-11-01-preview",
     "billingAccountName": "{billingAccountName}",
-    "invoiceSectionName": "12345"
+    "invoiceSectionName": "{invoiceSectionName}"
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionId}",
-        "name": "{invoiceSectionId}",
+        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}",
+        "name": "{invoiceSectionName}",
         "type": "Microsoft.Billing/invoiceSections",
         "properties": {
-          "displayName": "invoiceSectionName1"
+          "displayName": "invoiceSection1"
         }
       }
     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionPermissionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionPermissionsList.json
index 5d95fd846983..fe3af57626e2 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionPermissionsList.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionPermissionsList.json
@@ -1,8 +1,8 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100",
-        "invoiceSectionName": "123"
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}",
+        "invoiceSectionName": "{invoiceSectionName}"
     },
     "responses": {
         "200": {
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignment.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignment.json
index ab51f9e9e9d6..870f5f0273bc 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignment.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignment.json
@@ -1,9 +1,9 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100",
-        "invoiceSectionName": "123",
-        "billingRoleAssignmentName": "{billingRoleAssignmentId}"
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}",
+        "invoiceSectionName": "{invoiceSectionName}",
+        "billingRoleAssignmentName": "{billingRoleAssignmentName}"
     },
     "responses": {
         "200": {
@@ -16,7 +16,7 @@
                     "createdByPrincipalId": "",
                     "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
                     "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
-                    "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123"
+                    "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}"
                 },
                 "type": "Microsoft.Billing/billingRoleAssignments"
             }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentDelete.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentDelete.json
index ab51f9e9e9d6..870f5f0273bc 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentDelete.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentDelete.json
@@ -1,9 +1,9 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100",
-        "invoiceSectionName": "123",
-        "billingRoleAssignmentName": "{billingRoleAssignmentId}"
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}",
+        "invoiceSectionName": "{invoiceSectionName}",
+        "billingRoleAssignmentName": "{billingRoleAssignmentName}"
     },
     "responses": {
         "200": {
@@ -16,7 +16,7 @@
                     "createdByPrincipalId": "",
                     "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
                     "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
-                    "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123"
+                    "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}"
                 },
                 "type": "Microsoft.Billing/billingRoleAssignments"
             }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentList.json
index 6bf91df5b8ae..e726e9a7df6a 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentList.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentList.json
@@ -1,7 +1,7 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100",
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}",
         "invoiceSectionName": "{invoiceSectionName}"
     },
     "responses": {
@@ -17,7 +17,7 @@
                             "createdByPrincipalId": "",
                             "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
                             "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123"
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     },
@@ -30,7 +30,7 @@
                             "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1",
                             "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47",
                             "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123"
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     },
@@ -43,7 +43,7 @@
                             "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47",
                             "name": "10000000-aaaa-bbbb-cccc-100000000002_129db794-64a5-44e0-9838-002780478959",
                             "principalId": "129db794-64a5-44e0-9838-002780478959",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123"
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     },
@@ -56,7 +56,7 @@
                             "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47",
                             "name": "10000000-aaaa-bbbb-cccc-100000000001_d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7",
                             "principalId": "d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123"
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     },
@@ -69,7 +69,7 @@
                             "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47",
                             "name": "10000000-aaaa-bbbb-cccc-100000000000_c4f54fd2-d920-4c49-9b4d-9f09387b881c",
                             "principalId": "c4f54fd2-d920-4c49-9b4d-9f09387b881c",
-                            "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123"
+                            "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}"
                         },
                         "type": "Microsoft.Billing/billingRoleAssignments"
                     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinition.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinition.json
index 01744614bb81..c1b5f553474b 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinition.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinition.json
@@ -1,15 +1,15 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100",
-        "invoiceSectionName": "123",
-        "billingRoleDefinitionName": "{billingRoleDefinitionId}"
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}",
+        "invoiceSectionName": "{invoiceSectionName}",
+        "billingRoleDefinitionName": "{billingRoleDefinitionName}"
     },
     "responses": {
         "200": {
             "body": {
-                "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000",
-                "name": "10000000-aaaa-bbbb-cccc-100000000000",
+                "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingRoleDefinitions/{billingRoleDefinitionName}",
+                "name": "{billingRoleDefinitionName}",
                 "properties": {
                     "description": "The Owner role gives the user all permissions including access management rights to the Commerce Root.",
                     "permissions": [
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinitionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinitionsList.json
index eff798fdd233..44d9a4612da0 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinitionsList.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinitionsList.json
@@ -1,15 +1,15 @@
 {
     "parameters": {
-        "api-version": "2018-08-01-preview",
-        "billingAccountName": "2000100",
-        "invoiceSectionName": "123"
+        "api-version": "2018-11-01-preview",
+        "billingAccountName": "{billingAccountName}",
+        "invoiceSectionName": "{invoiceSectionName}"
     },
     "responses": {
         "200": {
             "body": {
                 "value": [
                     {
-                        "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000",
+                        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000",
                         "name": "10000000-aaaa-bbbb-cccc-100000000000",
                         "properties": {
                             "description": "The Owner role gives the user all permissions including access management rights to the Commerce Root.",
@@ -45,7 +45,7 @@
                         "type": "Microsoft.Billing/billingRoleDefinitions"
                     },
                     {
-                        "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/projects/234/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000001",
+                        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000001",
                         "name": "10000000-aaaa-bbbb-cccc-100000000001",
                         "properties": {
                             "description": "The Contributor role give the user all permissions except access management rights to the Commerce Root.",
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionWithExpand.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionWithExpand.json
index 996fa1fd7e51..f7f73a1689be 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionWithExpand.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionWithExpand.json
@@ -1,36 +1,37 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "2000200",
+    "billingAccountName": "{billingAccountName}",
     "invoiceSectionName": "{invoiceSectionName}",
     "$expand": "billingProfiles"
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionId}",
-        "name": "{invoiceSectionId}",
+        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}",
+        "name": "{invoiceSectionName}",
         "type": "Microsoft.Billing/invoiceSections",
         "properties": {
           "displayName": "invoiceSectionName1",
           "billingProfiles": [
             {
-              "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1",
-              "name": "BillingProfileId1",
+              "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
+              "name": "11000000-0000-0000-0000-000000000000",
               "type": "Microsoft.Billing/billingProfiles",
               "properties": {
-                "displayName": "BillingProfileName1",
-                "poNumber": "ABC12345",
-                "billingAddress": {
-                  "addressLine1": "Test Address",
-                  "addressLine2": "Test Address",
-                  "addressLine3": "Test Address",
+                "displayName": "BillingProfile1",
+                "address": {
+                  "companyName": "Contoso",
+                  "firstName": "Test",
+                  "lastName": "User",
+                  "addressLine1": "Test Address1",
+                  "addressLine2": "Test Address2",
+                  "addressLine3": "Test Address3",
                   "city": "City",
                   "postalCode": "00000",
                   "region": "WA",
-                  "country": "USA"
+                  "country": "US"
                 },
-                "isClassic": false,
                 "currency": "USD",
                 "enabledAzureSKUs": [
                   {
@@ -41,26 +42,31 @@
                     "skuId": "0002",
                     "skuDescription": "Microsoft Azure Standard"
                   }
-                ]
+                ],
+                "isClassic": false,
+                "invoiceDay": 5,
+                "invoiceEmailOptIn": true,
+                "poNumber": "ABC12345"
               }
             },
             {
-              "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId2",
-              "name": "BillingProfileId2",
+              "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000001",
+              "name": "11000000-0000-0000-0000-000000000001",
               "type": "Microsoft.Billing/billingProfiles",
               "properties": {
-                "displayName": "BillingProfileName2",
-                "poNumber": "ABC12345",
-                "billingAddress": {
-                  "addressLine1": "Test Address",
-                  "addressLine2": "Test Address",
-                  "addressLine3": "Test Address",
+                "displayName": "BillingProfile2",
+                "address": {
+                  "companyName": "Contoso",
+                  "firstName": "Test",
+                  "lastName": "User",
+                  "addressLine1": "Test Address1",
+                  "addressLine2": "Test Address2",
+                  "addressLine3": "Test Address3",
                   "city": "City",
                   "postalCode": "00000",
                   "region": "WA",
-                  "country": "USA"
+                  "country": "US"
                 },
-                "isClassic": false,
                 "currency": "USD",
                 "enabledAzureSKUs": [
                   {
@@ -71,7 +77,11 @@
                     "skuId": "0002",
                     "skuDescription": "Microsoft Azure Standard"
                   }
-                ]
+                ],
+                "isClassic": false,
+                "invoiceDay": 5,
+                "invoiceEmailOptIn": true,
+                "poNumber": "ABC12345"
               }
             }
           ]
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountName.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountName.json
index 1452bd928159..24a5eb263f61 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountName.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountName.json
@@ -8,19 +8,19 @@
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1",
-            "name": "invoiceSectionId1",
+            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
+            "name": "22000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/invoiceSections",
             "properties": {
-              "displayName": "invoiceSectionName1"
+              "displayName": "invoiceSection1"
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId2",
-            "name": "invoiceSectionId2",
+            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000011",
+            "name": "22000000-0000-0000-0000-000000000011",
             "type": "Microsoft.Billing/invoiceSections",
             "properties": {
-              "displayName": "invoiceSectionName2"
+              "displayName": "invoiceSection2"
             }
           }
         ]
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithCreateSubPermission.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithCreateSubPermission.json
index 6de80e74ad65..d308e0dd9cb0 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithCreateSubPermission.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithCreateSubPermission.json
@@ -8,11 +8,11 @@
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1",
-            "name": "invoiceSectionId1",
+            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
+            "name": "22000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/invoiceSections",
             "properties": {
-              "displayName": "invoiceSectionName1"
+              "displayName": "invoiceSection1"
             }
           }
         ]
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpand.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpand.json
index 2e026e54d5e5..92796cfb1488 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpand.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpand.json
@@ -9,29 +9,30 @@
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1",
-            "name": "invoiceSectionId1",
+            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
+            "name": "22000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/invoiceSections",
             "properties": {
-              "displayName": "invoiceSectionName1",
+              "displayName": "invoiceSection1",
               "billingProfiles": [
                 {
-                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1",
-                  "name": "BillingProfileId1",
+                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
+                  "name": "11000000-0000-0000-0000-000000000000",
                   "type": "Microsoft.Billing/billingProfiles",
                   "properties": {
-                    "displayName": "BillingProfileName1",
-                    "poNumber": "ABC12345",
-                    "billingAddress": {
-                      "addressLine1": "Test Address",
-                      "addressLine2": "Test Address",
-                      "addressLine3": "Test Address",
+                    "displayName": "BillingProfile1",
+                    "address": {
+                      "companyName": "Contoso",
+                      "firstName": "Test",
+                      "lastName": "User",
+                      "addressLine1": "Test Address1",
+                      "addressLine2": "Test Address2",
+                      "addressLine3": "Test Address3",
                       "city": "City",
                       "postalCode": "00000",
                       "region": "WA",
                       "country": "US"
                     },
-                    "isClassic": false,
                     "currency": "USD",
                     "enabledAzureSKUs": [
                       {
@@ -42,26 +43,31 @@
                         "skuId": "0002",
                         "skuDescription": "Microsoft Azure Standard"
                       }
-                    ]
+                    ],
+                    "isClassic": false,
+                    "invoiceDay": 5,
+                    "invoiceEmailOptIn": true,
+                    "poNumber": "ABC12345"
                   }
                 },
                 {
-                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId2",
-                  "name": "BillingProfileId2",
+                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000001",
+                  "name": "11000000-0000-0000-0000-000000000001",
                   "type": "Microsoft.Billing/billingProfiles",
                   "properties": {
-                    "displayName": "BillingProfileName2",
-                    "poNumber": "ABC12345",
-                    "billingAddress": {
-                      "addressLine1": "Test Address",
-                      "addressLine2": "Test Address",
-                      "addressLine3": "Test Address",
+                    "displayName": "BillingProfile2",
+                    "address": {
+                      "companyName": "Contoso",
+                      "firstName": "Test",
+                      "lastName": "User",
+                      "addressLine1": "Test Address1",
+                      "addressLine2": "Test Address2",
+                      "addressLine3": "Test Address3",
                       "city": "City",
                       "postalCode": "00000",
                       "region": "WA",
                       "country": "US"
                     },
-                    "isClassic": false,
                     "currency": "USD",
                     "enabledAzureSKUs": [
                       {
@@ -72,36 +78,41 @@
                         "skuId": "0002",
                         "skuDescription": "Microsoft Azure Standard"
                       }
-                    ]
+                    ],
+                    "isClassic": false,
+                    "invoiceDay": 5,
+                    "invoiceEmailOptIn": true,
+                    "poNumber": "ABC12345"
                   }
                 }
               ]
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId2",
-            "name": "invoiceSectionId2",
+            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000011",
+            "name": "22000000-0000-0000-0000-000000000011",
             "type": "Microsoft.Billing/invoiceSections",
             "properties": {
-              "displayName": "invoiceSectionName2",
+              "displayName": "invoiceSection2",
               "billingProfiles": [
                 {
-                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId3",
-                  "name": "BillingProfileId3",
+                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000004",
+                  "name": "11000000-0000-0000-0000-000000000004",
                   "type": "Microsoft.Billing/billingProfiles",
                   "properties": {
-                    "displayName": "BillingProfileName3",
-                    "poNumber": "ABC12345",
-                    "billingAddress": {
-                      "addressLine1": "Test Address",
-                      "addressLine2": "Test Address",
-                      "addressLine3": "Test Address",
+                    "displayName": "BillingProfile3",
+                    "address": {
+                      "companyName": "Contoso Test",
+                      "firstName": "Test",
+                      "lastName": "User",
+                      "addressLine1": "Test Address1",
+                      "addressLine2": "Test Address2",
+                      "addressLine3": "Test Address3",
                       "city": "City",
                       "postalCode": "00000",
                       "region": "WA",
                       "country": "US"
                     },
-                    "isClassic": false,
                     "currency": "USD",
                     "enabledAzureSKUs": [
                       {
@@ -112,26 +123,31 @@
                         "skuId": "0002",
                         "skuDescription": "Microsoft Azure Standard"
                       }
-                    ]
+                    ],
+                    "isClassic": false,
+                    "invoiceDay": 5,
+                    "invoiceEmailOptIn": true,
+                    "poNumber": "ABC12345"
                   }
                 },
                 {
-                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId4",
-                  "name": "BillingProfileId4",
+                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000005",
+                  "name": "11000000-0000-0000-0000-000000000005",
                   "type": "Microsoft.Billing/billingProfiles",
                   "properties": {
-                    "displayName": "BillingProfileName4",
-                    "poNumber": "ABC12345",
-                    "billingAddress": {
-                      "addressLine1": "Test Address",
-                      "addressLine2": "Test Address",
-                      "addressLine3": "Test Address",
+                    "displayName": "BillingProfile4",
+                    "address": {
+                      "companyName": "Contoso Test",
+                      "firstName": "Test",
+                      "lastName": "User",
+                      "addressLine1": "Test Address1",
+                      "addressLine2": "Test Address2",
+                      "addressLine3": "Test Address3",
                       "city": "City",
                       "postalCode": "00000",
                       "region": "WA",
                       "country": "US"
                     },
-                    "isClassic": false,
                     "currency": "USD",
                     "enabledAzureSKUs": [
                       {
@@ -142,7 +158,11 @@
                         "skuId": "0002",
                         "skuDescription": "Microsoft Azure Standard"
                       }
-                    ]
+                    ],
+                    "isClassic": false,
+                    "invoiceDay": 5,
+                    "invoiceEmailOptIn": true,
+                    "poNumber": "ABC12345"
                   }
                 }
               ]
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpandAndCreateSubPermission.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpandAndCreateSubPermission.json
index b5ba7877c3e3..e6bbd954ad8a 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpandAndCreateSubPermission.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpandAndCreateSubPermission.json
@@ -9,29 +9,30 @@
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1",
-            "name": "invoiceSectionId1",
+            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
+            "name": "22000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/invoiceSections",
             "properties": {
-              "displayName": "invoiceSectionName1",
+              "displayName": "invoiceSection1",
               "billingProfiles": [
                 {
-                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1",
-                  "name": "BillingProfileId1",
+                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
+                  "name": "11000000-0000-0000-0000-000000000000",
                   "type": "Microsoft.Billing/billingProfiles",
                   "properties": {
-                    "displayName": "BillingProfileName1",
-                    "poNumber": "ABC12345",
-                    "billingAddress": {
-                      "addressLine1": "Test Address",
-                      "addressLine2": "Test Address",
-                      "addressLine3": "Test Address",
+                    "displayName": "BillingProfile1",
+                    "address": {
+                      "companyName": "Contoso",
+                      "firstName": "Test",
+                      "lastName": "User",
+                      "addressLine1": "Test Address1",
+                      "addressLine2": "Test Address2",
+                      "addressLine3": "Test Address3",
                       "city": "City",
                       "postalCode": "00000",
                       "region": "WA",
                       "country": "US"
                     },
-                    "isClassic": false,
                     "currency": "USD",
                     "enabledAzureSKUs": [
                       {
@@ -42,26 +43,31 @@
                         "skuId": "0002",
                         "skuDescription": "Microsoft Azure Standard"
                       }
-                    ]
+                    ],
+                    "isClassic": false,
+                    "invoiceDay": 5,
+                    "invoiceEmailOptIn": true,
+                    "poNumber": "ABC12345"
                   }
                 },
                 {
-                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId2",
-                  "name": "BillingProfileId2",
+                  "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000001",
+                  "name": "11000000-0000-0000-0000-000000000001",
                   "type": "Microsoft.Billing/billingProfiles",
                   "properties": {
-                    "displayName": "BillingProfileName2",
-                    "poNumber": "ABC12345",
-                    "billingAddress": {
-                      "addressLine1": "Test Address",
-                      "addressLine2": "Test Address",
-                      "addressLine3": "Test Address",
+                    "displayName": "BillingProfile2",
+                    "address": {
+                      "companyName": "Contoso",
+                      "firstName": "Test",
+                      "lastName": "User",
+                      "addressLine1": "Test Address1",
+                      "addressLine2": "Test Address2",
+                      "addressLine3": "Test Address3",
                       "city": "City",
                       "postalCode": "00000",
                       "region": "WA",
                       "country": "US"
                     },
-                    "isClassic": false,
                     "currency": "USD",
                     "enabledAzureSKUs": [
                       {
@@ -72,7 +78,11 @@
                         "skuId": "0002",
                         "skuDescription": "Microsoft Azure Standard"
                       }
-                    ]
+                    ],
+                    "isClassic": false,
+                    "invoiceDay": 5,
+                    "invoiceEmailOptIn": true,
+                    "poNumber": "ABC12345"
                   }
                 }
               ]
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingProfileName.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingProfileName.json
index 06936c1697fe..104d9ef7fd4d 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingProfileName.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingProfileName.json
@@ -1,27 +1,27 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "billingAccountName",
-    "billingProfileName": "billingProfileName"
+    "billingAccountName": "{billingAccountName}",
+    "billingProfileName": "{billingProfileName}"
   },
   "responses": {
     "200": {
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1",
-            "name": "invoiceSectionId1",
+            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
+            "name": "22000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/invoiceSections",
             "properties": {
-              "displayName": "invoiceSectionName1"
+              "displayName": "invoiceSection1"
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId2",
-            "name": "invoiceSectionId2",
+            "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000011",
+            "name": "22000000-0000-0000-0000-000000000011",
             "type": "Microsoft.Billing/invoiceSections",
             "properties": {
-              "displayName": "invoiceSectionName2"
+              "displayName": "invoiceSection2"
             }
           }
         ]
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoicesListByBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoicesListByBillingProfile.json
index 94f2974e9f88..14efb757dd07 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoicesListByBillingProfile.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoicesListByBillingProfile.json
@@ -1,8 +1,8 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "2000200",
-    "billingProfileName": "BillingProfileId1",
+    "billingAccountName": "{billingAccountName}",
+    "billingProfileName": "{billingProfileName}",
     "periodStartDate": "2018-01-01",
     "periodEndDate": "2018-06-30",
     "$filter": "invoicePeriodStartDate le 2018-06-01"
@@ -12,7 +12,7 @@
       "body": {
         "value": [
           {
-            "id": "providers/Microsoft.Billing/billingAccounts/2000200/billingProfile/345986/invoices/1383723",
+            "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoices/1383723",
             "name": "1383723",
             "type": "Microsoft.Billing/invoices",
             "properties": {
@@ -29,7 +29,8 @@
               },
               "invoicePeriodStartDate": "2018-01-01T17:32:28Z",
               "invoicePeriodEndDate": "2018-01-15T17:32:28Z",
-              "billingProfile": "345986",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
+              "billingProfileName": "Contoso Operations Billing",
               "purchaseOrderNumber": "123456",
               "documentUrls": [
                 {
@@ -58,7 +59,7 @@
             }
           },
           {
-            "id": "providers/Microsoft.Billing/billingAccounts/2000200/billingProfile/345986/invoices/1383724",
+            "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoices/1383724",
             "name": "1383724",
             "type": "Microsoft.Billing/invoices",
             "properties": {
@@ -75,7 +76,8 @@
               },
               "invoicePeriodStartDate": "2018-02-01T17:32:28Z",
               "invoicePeriodEndDate": "2018-02-30T17:32:28Z",
-              "billingProfile": "345987",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
+              "billingProfileName": "Contoso Operations Billing",
               "purchaseOrderNumber": "123456",
               "documentUrls": [
                 {
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListRecipientTransfers.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListRecipientTransfers.json
index fe90496f94d4..87e1290fbcc5 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListRecipientTransfers.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListRecipientTransfers.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2018-08-01-preview"
+    "api-version": "2018-11-01-preview"
   },
 
   "responses": {
@@ -13,7 +13,7 @@
               "expirationTime": "2018-11-05T17:32:28Z",
               "transferStatus": "InProgress",
               "recipientEmailId": "user@contoso.com",
-              "initiatorEmailId": "user@contoso.com",
+              "initiatorEmailId": "xyz@contoso.com",
               "lastModifiedTime": "2018-10-10T17:32:28Z",
               "detailedTransferStatus": [
                 {
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListTransfers.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListTransfers.json
index 2fdc7002e9fb..423228a6bc88 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListTransfers.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListTransfers.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2018-08-01-preview",
+    "api-version": "2018-11-01-preview",
     "billingAccountName": "billingAccountName",
     "invoiceSectionName": "invoiceSectionName"
   },
@@ -17,7 +17,7 @@
               "billingAccountId": "billingAccountName",
               "transferStatus": "InProgress",
               "recipientEmailId": "user@contoso.com",
-              "initiatorEmailId": "user@contoso.com",
+              "initiatorEmailId": "xyz@contoso.com",
               "lastModifiedTime": "2018-10-10T17:32:28Z",
               "detailedTransferStatus": [
                 {
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PaymentMethodsListByBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PaymentMethodsListByBillingProfile.json
index 470f59175f6d..1f5324e5c673 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PaymentMethodsListByBillingProfile.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PaymentMethodsListByBillingProfile.json
@@ -1,29 +1,30 @@
 {
 	"parameters": {
 		"api-version": "2018-11-01-preview",
-		"billingAccountName": "84ae600f-763c-4a66-a8f0-4c497fc58d98",
-		"billingProfileName": "95869cd5-6f00-42b3-8708-04e85fef9e15"
+		"billingAccountName": "{billingAccountName}",
+    "billingProfileName": "{billingProfileName}"
 	},
 	"responses": {
 		"200": {
 			"value": [
 				{
-					"id": "/providers/Microsoft.Billing/billingAccounts/04e9d123-ae03-5621-6c17-e70da00924ee/billingProfiles/2291f7a6-e97a-4bb8-83d7-6090beb137e1/paymentMethods/001bb358-822c-42c0-a8a2-fa05a52c3dcd",
-					"name": "001bb358-822c-42c0-a8a2-fa05a52c3dcd",
+					"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/paymentMethods/00000000-0000-0000-0000-000000000055",
+					"name": "00000000-0000-0000-0000-000000000055",
 					"type": "Microsoft.Billing/paymentMethods",
 					"properties": {
-						"paymentMethodType": "Credits",
+						"currency": "USD",
 						"details": "Credits",
-						"currency": "USD"
+            "expiration": "4/2020",
+            "paymentMethodType": "Credits"
 					}
 				},
 				{
-					"id": "/providers/Microsoft.Billing/billingAccounts/04e9d123-ae03-5621-6c17-e70da00924ee/billingProfiles/2291f7a6-e97a-4bb8-83d7-6090beb137e1/paymentMethods/21dd9edc-af71-4d62-80ce-37151d475326",
-					"name": "21dd9edc-af71-4d62-80ce-37151d475326",
+					"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/paymentMethods/00000000-0000-0000-0000-000000000026",
+					"name": "00000000-0000-0000-0000-000000000026",
 					"type": "Microsoft.Billing/paymentMethods",
 					"properties": {
-						"paymentMethodType": "CheckWire",
-						"details": "CheckWire"
+						"details": "Check Wire",
+						"paymentMethodType": "CheckWire"
 					}
 				}
 			]
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Policy.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Policy.json
index 8e26a99fad5c..9a617ffbf1a7 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Policy.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Policy.json
@@ -2,17 +2,18 @@
   "parameters": {
     "api-version": "2018-11-01-preview",
     "billingAccountName": "{billingAccountName}",
-    "billingProfileName": "BillingProfileId1"
+    "billingProfileName": "{billingProfileName}"
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1/policies/default",
-        "name": "latest",
+        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/policies/default",
+        "name": "default",
         "type": "Microsoft.Billing/policies",
         "properties": {
+          "marketplacePurchasesAllowed": true,
           "reservationPurchasesAllowed": true,
-          "marketplacePurchasesAllowed": true
+          "subscriptionOwnerCanViewCharges":  true
         }
       }
     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PricesheetDownload.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PricesheetDownload.json
index 832b247cd2e9..d8381deb650e 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PricesheetDownload.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PricesheetDownload.json
@@ -1,21 +1,21 @@
 {
   "parameters": {
     "api-version": "2018-03-01-preview",
-    "billingAccountName": "84ae600f-763c-4a66-a8f0-4c497fc58d98",
-    "invoiceName": "95869cd5-6f00-42b3-8708-04e85fef9e15"
+    "billingAccountName": "{billingAccountName}",
+    "invoiceName": "{invoiceName}"
   },
   "responses": {
     "202": {
       "headers": {
-        "Location": "https://management.azure.com/providers/Microsoft.Billing/operationResults/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-07-31",
+        "Location": "https://management.azure.com/providers/Microsoft.Billing/operationResults/45000000-0000-0000-0000-000000000000?api-version=2018-07-31",
         "Retry-After": "60",
-        "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/operationStatus/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-07-31",
-        "OData-EntityId": "84ae600f-763c-4a66-a8f0-4c497fc58d98"
+        "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/operationStatus/45000000-0000-0000-0000-000000000000?api-version=2018-07-31",
+        "OData-EntityId": "45000000-0000-0000-0000-000000000000"
       }
     },
     "200": {
       "body": {
-        "url": "https://myaccount.blob.core.windows.net/?restype=service&comp=properties&sv=2015-04-05&ss=bf&srt=s&st=2015-04-29T22%3A18%3A26Z&se=2015-04-30T02%3A23%3A26Z&sr=b&sp=rw&sip=168.1.5.60-168.1.5.70&spr=https&sig=F%6GRVAZ5Cdj2Pw4tgU7IlSTkWgn7bUkkAg8P6HESXwmf%4B",
+        "url": "https://myaccount.blob.core.windows.net/?restype=service&comp=properties&sv=2015-04-05&ss=bf&srt=s&st=2015-04-29T22%3A18%3A26Z&se=2015-04-30T02%3A23%3A26Z&sr=b&sp=rw&spr=https&sig=G%2TEST%4B",
         "expiryTime": "2018-07-21T17:32:28Z"
       }
     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Product.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Product.json
index 0215c6357d17..9ca77df91fca 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Product.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Product.json
@@ -1,16 +1,16 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "1234",
-    "invoiceSectionName": "42425",
-    "productName": "productSummaryId1"
+    "billingAccountName": "{billingAccountName}",
+    "invoiceSectionName": "{invoiceSectionName}",
+    "productName": "{productName}"
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId1",
-        "name": "productSummaryId1",
-        "type": "Microsoft.Consumption/products",
+        "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/{productName}",
+        "name": "{productName}",
+        "type": "Microsoft.Billing/products",
         "properties": {
           "productTypeId": "A12345",
           "productType": "Subscription",
@@ -27,10 +27,10 @@
           "skuId": "0001",
           "skuDescription": "Enterprise Agreement Development",
           "availabilityId": "AvailabilityId1",
-          "parentProductId": "eligibleOffer2",
-          "invoiceSectionId": "42425",
+          "parentProductId": "45000000-0000-0000-0000-0000000001242",
+          "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}",
           "invoiceSectionName": "Contoso operations invoiceSection",
-          "billingProfileId": "789456",
+          "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
           "billingProfileName": "Contoso operations billing"
         }
       }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelByBillingAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelByBillingAccount.json
index f8417411721c..980ced832971 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelByBillingAccount.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelByBillingAccount.json
@@ -1,8 +1,8 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "1234",
-    "productName": "productSummaryId1",
+    "billingAccountName": "{billingAccountName}",
+    "productName": "{productName}",
     "body": {
       "autoRenew": "false"
     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelForInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelForInvoiceSection.json
index 2fa803b3be8a..905e91c9e31b 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelForInvoiceSection.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelForInvoiceSection.json
@@ -1,9 +1,9 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "1234",
-    "invoiceSectionName": "1234",
-    "productName" : "234",
+    "billingAccountName": "{billingAccountName}",
+    "invoiceSectionName": "{invoiceSectionName}",
+    "productName" : "{productName}",
     "body": {
         "autoRenew" : "false"
     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByBillingAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByBillingAccount.json
index 78907b5c37f4..1f4fc2243437 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByBillingAccount.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByBillingAccount.json
@@ -1,16 +1,16 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "1234"
+    "billingAccountName": "{billingAccountName}"
   },
   "responses": {
     "200": {
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId1",
-            "name": "productSummaryId1",
-            "type": "Microsoft.Consumption/products",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/00000000-0000-0000-0000-000000000000",
+            "name": "00000000-0000-0000-0000-000000000000",
+            "type": "Microsoft.Billing/products",
             "properties": {
               "productTypeId": "A12345",
               "productType": "Reservation",
@@ -27,17 +27,17 @@
               "skuDescription": "Enterprise Agreement Development",
               "availabilityId": "AvailabilityId1",
               "billingFrequency": "OneTime",
-              "parentProductId": "eligibleOffer2",
-              "invoiceSectionId": "42425",
+              "parentProductId": "45000000-0000-0000-0000-0000000001242",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "789456",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
               "billingProfileName": "Contoso operations billing"
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId2",
-            "name": "productSummaryId2",
-            "type": "Microsoft.Consumption/products",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/10000000-0000-0000-0000-000000000001",
+            "name": "10000000-0000-0000-0000-000000000001",
+            "type": "Microsoft.Billing/products",
             "properties": {
               "productTypeId": "A12345",
               "productType": "Azure subscription",
@@ -54,10 +54,10 @@
               "skuDescription": "Enterprise Agreement Development",
               "availabilityId": "AvailabilityId1",
               "billingFrequency": "Monthly",
-              "parentProductId": "eligibleOffer2",
-              "invoiceSectionId": "456789",
+              "parentProductId": "45000000-0000-0000-0000-0000000001242",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "789456",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
               "billingProfileName": "Contoso operations billing"
             }
           }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByInvoiceSection.json
index 220c80e35ebb..905490407118 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByInvoiceSection.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByInvoiceSection.json
@@ -1,18 +1,17 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "1234",
-    "invoiceSectionName": "42425",
-    "$expand": "subscriptions"
+    "billingAccountName": "{billingAccountName}",
+    "invoiceSectionName": "{invoiceSectionName}"
   },
   "responses": {
     "200": {
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId1",
-            "name": "productSummaryId1",
-            "type": "Microsoft.Consumption/products",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/00000000-0000-0000-0000-000000000000",
+            "name": "00000000-0000-0000-0000-000000000000",
+            "type": "Microsoft.Billing/products",
             "properties": {
               "productTypeId": "A12345",
               "productType": "Reservation",
@@ -29,17 +28,17 @@
               "skuId": "0001",
               "skuDescription": "Enterprise Agreement Development",
               "availabilityId": "AvailabilityId1",
-              "parentProductId": "eligibleOffer2",
-              "invoiceSectionId": "42425",
+              "parentProductId": "45000000-0000-0000-0000-0000000001242",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "789456",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
               "billingProfileName": "Contoso operations billing"
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/products/productSummaryId2",
-            "name": "productSummaryId2",
-            "type": "Microsoft.Consumption/products",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/10000000-0000-0000-0000-000000000001",
+            "name": "10000000-0000-0000-0000-000000000001",
+            "type": "Microsoft.Billing/products",
             "properties": {
               "productTypeId": "A12345",
               "productType": "Azure subscription",
@@ -56,10 +55,10 @@
               "skuId": "0001",
               "skuDescription": "Enterprise Agreement Development",
               "availabilityId": "AvailabilityId1",
-              "parentProductId": "eligibleOffer2",
-              "invoiceSectionId": "42425",
+              "parentProductId": "45000000-0000-0000-0000-0000000001242",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "789456",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
               "billingProfileName": "Contoso operations billing"
             }
           }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingAccount.json
index df9e5349e4e8..97d3d9dc1918 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingAccount.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingAccount.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "1234",
+    "billingAccountName": "{billingAccountName}",
     "startDate": "2018-04-01",
     "endDate": "2018-05-30",
     "$filter": "properties/kind eq 'Reservation'"
@@ -11,8 +11,8 @@
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/transactions/transactionSummaryId1",
-            "name": "transactionSummaryId1",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/41000000-0000-0000-0000-000000000000",
+            "name": "41000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/transactions",
             "properties": {
               "kind": "reservation",
@@ -29,23 +29,23 @@
                 }
               ,
               "quantity": 4,
-              "invoiceSectionId": "123456",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "789456",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
               "billingProfileName": "Contoso operations billing",
-              "subscriptionId": "789456",
+              "subscriptionId": "7800000000-0000-0000-0000-0000000000009456",
               "subscriptionName": "Contoso operations billing"
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/transactions/transactionSummaryId2",
-            "name": "transactionSummaryId2",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/21000000-0000-0000-0000-000000000000",
+            "name": "21000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/transactions",
             "properties": {
               "kind": "reservation",
               "date": "2018-05-05T00:00:00Z",
               "invoice": "Pending",
-              "orderName": "MSFT Reserved",
+              "orderName": "Test Reserved",
               "orderId": "1c24006f-8350-4315-ad8f-6d11180448f9",
               "productDescription": "Standard D1, US West 3",
               "transactionType": "Purchase",
@@ -56,11 +56,11 @@
                 }
               ,
               "quantity": 5,
-              "invoiceSectionId": "123456",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "789456",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
               "billingProfileName": "Contoso operations billing",
-              "subscriptionId": "789456",
+              "subscriptionId": "00000000-0000-0000-0000-000000000000",
               "subscriptionName": "Contoso operations billing"
             }
           }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingProfile.json
index 69f063b1225e..a76bee9aa632 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingProfile.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingProfile.json
@@ -1,8 +1,8 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "1234",
-    "billingProfileName": "42425",
+    "billingAccountName": "{billingAccountName}",
+    "billingProfileName": "{billingProfileName}",
     "startDate": "2018-04-01",
     "endDate": "2018-05-30",
     "$filter": "properties/kind eq 'Reservation'"
@@ -12,8 +12,8 @@
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/BillingProfiles/42425/transactions/transactionSummaryId1",
-            "name": "transactionSummaryId1",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/{billingProfileName}/transactions/41000000-0000-0000-0000-000000000000",
+            "name": "41000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/transactions",
             "properties": {
               "kind": "reservation",
@@ -28,23 +28,23 @@
                 "value": 5000.00
               },
               "quantity": 4,
-              "invoiceSectionId": "123456",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "42425",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
               "billingProfileName": "Contoso operations billing",
-              "subscriptionId": "789456",
+              "subscriptionId": "00000000-0000-0000-0000-000000000000",
               "subscriptionName": "Contoso operations billing"
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/BillingProfiles/42425/transactions/transactionSummaryId2",
-            "name": "transactionSummaryId2",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/{billingProfileName}/transactions/65000000-0000-0000-0000-000000000000",
+            "name": "65000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/transactions",
             "properties": {
               "kind": "reservation",
               "date": "2018-05-05T00:00:00Z",
               "invoice": "Pending",
-              "orderName": "MSFT Reserved",
+              "orderName": "Test Reserved",
               "orderId": "1c24006f-8350-4315-ad8f-6d11180448f9",
               "productDescription": "Standard D1, US West 3",
               "transactionType": "Purchase",
@@ -53,11 +53,11 @@
                 "value": 6000.00
               },
               "quantity": 5,
-              "invoiceSectionId": "123456",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "42425",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
               "billingProfileName": "Contoso operations billing",
-              "subscriptionId": "789456",
+              "subscriptionId": "82000000-0000-0000-0000-000000000000",
               "subscriptionName": "Contoso operations billing"
             }
           }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByInvoiceSection.json
index aa068134bd3c..104da0e9a4e9 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByInvoiceSection.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByInvoiceSection.json
@@ -1,8 +1,8 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "1234",
-    "invoiceSectionName": "42425",
+    "billingAccountName": "{billingAccountName}",
+    "invoiceSectionName": "{invoiceSectionName}",
     "startDate": "2018-04-01",
     "endDate": "2018-05-30",
     "$filter": "properties/kind eq 'Reservation'"
@@ -12,8 +12,8 @@
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/InvoiceSection/42425/transactions/transactionSummaryId1",
-            "name": "transactionSummaryId1",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSections/{invoiceSectionName}/transactions/41000000-0000-0000-0000-000000000000",
+            "name": "41000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/transactions",
             "properties": {
               "kind": "reservation",
@@ -28,23 +28,23 @@
                 "value": 5000.00
               },
               "quantity": 4,
-              "invoiceSectionId": "42425",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "789456",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
               "billingProfileName": "Contoso operations billing",
-              "subscriptionId": "789456",
+              "subscriptionId": "00000000-0000-0000-0000-000000000000",
               "subscriptionName": "Contoso operations billing"
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/InvoiceSection/42425/transactions/transactionSummaryId2",
-            "name": "transactionSummaryId2",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSections/{invoiceSectionName}/transactions/82000000-0000-0000-0000-000000000000",
+            "name": "82000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/transactions",
             "properties": {
               "kind": "reservation",
               "date": "2018-05-05T00:00:00Z",
               "invoice": "Pending",
-              "orderName": "MSFT Reserved",
+              "orderName": "Test Reserved",
               "orderId": "1c24006f-8350-4315-ad8f-6d11180448f9",
               "productDescription": "Standard D1, US West 3",
               "transactionType": "Purchase",
@@ -53,11 +53,11 @@
                 "value": 6000.00
               },
               "quantity": 5,
-              "invoiceSectionId": "42425",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "789456",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
               "billingProfileName": "Contoso operations billing",
-              "subscriptionId": "789456",
+              "subscriptionId": "00000000-0000-0000-0000-000000000000",
               "subscriptionName": "Contoso operations billing"
             }
           }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingAccount.json
index 4600862a2f05..d96bb3d6fc3e 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingAccount.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingAccount.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "1234",
+    "billingAccountName": "{billingAccountName}",
     "startDate": "2018-04-01",
     "endDate": "2018-05-30"
   },
@@ -10,13 +10,14 @@
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/transactions/transactionSummaryId1",
-            "name": "transactionSummaryId1",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/41000000-0000-0000-0000-000000000000",
+            "name": "41000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/transactions",
             "properties": {
               "kind": "all",
               "date": "2018-05-01T00:00:00Z",
               "invoice": "2344233",
+              "productFamily": "Storage",
               "productTypeId": "A12345",
               "productType": "Dev Support",
               "productDescription": "Standard D1, US West 3",
@@ -25,20 +26,21 @@
                 "currency": "USD",
                 "value": 5000.00
               },
-              "invoiceSectionId": "123456",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "789456",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
               "billingProfileName": "Contoso operations billing"
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/transactions/transactionSummaryId2",
-            "name": "transactionSummaryId2",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/51000000-0000-0000-0000-000000000000",
+            "name": "51000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/transactions",
             "properties": {
               "kind": "all",
               "date": "2018-04-01T00:00:00Z",
               "invoice": "pending",
+              "productFamily": "Storage",
               "productTypeId": "A12345",
               "productType": "Azure subscription",
               "productDescription": "Send grid Gold",
@@ -47,9 +49,9 @@
                 "currency": "USD",
                 "value": 50.00
               },
-              "invoiceSectionId": "123456",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "789456",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
               "billingProfileName": "Contoso operations billing"
             }
           }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingProfile.json
index 514cf329d75a..9f074b2c00b2 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingProfile.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingProfile.json
@@ -1,8 +1,8 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "1234",
-    "billingProfileName": "42425",
+    "billingAccountName": "{billingAccountName}",
+    "billingProfileName": "{billingProfileName}",
     "startDate": "2018-04-01",
     "endDate": "2018-05-30"
   },
@@ -11,13 +11,14 @@
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/BillingProfiles/42425/transactions/transactionSummaryId1",
-            "name": "transactionSummaryId1",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/{billingProfileName}/transactions/41000000-0000-0000-0000-000000000000",
+            "name": "41000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/transactions",
             "properties": {
               "kind": "all",
               "date": "2018-05-01T00:00:00Z",
               "invoice": "2344233",
+              "productFamily": "Storage",
               "productTypeId": "A12345",
               "productType": "VM Instance",
               "productDescription": "Standard D1, US West 3",
@@ -26,20 +27,21 @@
                 "currency": "USD",
                 "value": 5000.00
               },
-              "invoiceSectionId": "123456",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "42425",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
               "billingProfileName": "Contoso operations billing"
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/BillingProfiles/42425/transactions/transactionSummaryId2",
-            "name": "transactionSummaryId2",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/{billingProfileName}/transactions/51000000-0000-0000-0000-000000000000",
+            "name": "51000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/transactions",
             "properties": {
               "kind": "all",
               "date": "2018-04-01T00:00:00Z",
               "invoice": "pending",
+              "productFamily": "Storage",
               "productTypeId": "A12345",
               "productType": "VM Instance",
               "productDescription": "Standard Support",
@@ -48,9 +50,9 @@
                 "currency": "USD",
                 "value": 50.00
               },
-              "invoiceSectionId": "123456",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "42425",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
               "billingProfileName": "Contoso operations billing"
             }
           }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByInvoiceSection.json
index e0a46a14afc4..7113b74ac574 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByInvoiceSection.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByInvoiceSection.json
@@ -1,8 +1,8 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "1234",
-    "invoiceSectionName": "42425",
+    "billingAccountName": "{billingAccountName}",
+    "invoiceSectionName": "{invoiceSectionName}",
     "startDate": "2018-04-01",
     "endDate": "2018-05-30"
   },
@@ -11,13 +11,14 @@
       "body": {
         "value": [
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/InvoiceSection/42425/transactions/transactionSummaryId1",
-            "name": "transactionSummaryId1",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSections/{invoiceSectionName}/transactions/41000000-0000-0000-0000-000000000000",
+            "name": "41000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/transactions",
             "properties": {
               "kind": "all",
               "date": "2018-05-01T00:00:00Z",
               "invoice": "2344233",
+              "productFamily": "Storage",
               "productTypeId": "A12345",
               "productType": "Reserved VM Instance",
               "productDescription": "Standard D1, US West 3",
@@ -26,20 +27,21 @@
                 "currency": "USD",
                 "value": 5000.00
               },
-              "invoiceSectionId": "42425",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "789456",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
               "billingProfileName": "Contoso operations billing"
             }
           },
           {
-            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/InvoiceSection/42425/transactions/transactionSummaryId2",
-            "name": "transactionSummaryId2",
+            "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSections/{invoiceSectionName}/transactions/51000000-0000-0000-0000-000000000000",
+            "name": "51000000-0000-0000-0000-000000000000",
             "type": "Microsoft.Billing/transactions",
             "properties": {
               "kind": "all",
               "date": "2018-04-01T00:00:00Z",
               "invoice": "pending",
+              "productFamily": "Storage",
               "productTypeId": "A12345",
               "productType": "VM Instance",
               "productDescription": "Standard Support",
@@ -48,9 +50,9 @@
                 "currency": "USD",
                 "value": 50.00
               },
-              "invoiceSectionId": "42425",
+              "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}",
               "invoiceSectionName": "Contoso operations invoiceSection",
-              "billingProfileId": "789456",
+              "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
               "billingProfileName": "Contoso operations billing"
             }
           }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferBillingSubscription.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferBillingSubscription.json
index 4bed2fa3a8b0..70de2e8db7a4 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferBillingSubscription.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferBillingSubscription.json
@@ -1,26 +1,26 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "billingAccountName",
-    "invoiceSectionName": "invoiceSectionId",
-    "billingSubscriptionName": "subscriptionId",
+    "billingAccountName": "{billingAccountName}",
+    "invoiceSectionName": "{invoiceSectionName}",
+    "billingSubscriptionName": "{billingSubscriptionName}",
     "parameters": {
-      "destinationInvoiceSectionName": "destinationInvoiceSectionId"
+      "destinationInvoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{newInvoiceSectionName}"
     }
   },
   "responses": {
     "200": {
       "body": {
         "properties" : {
-          "billingSubscriptionName": "subscriptionId"
+          "billingSubscriptionName": "Test subscription"
         }
       }
     },
     "202": {
       "headers": {
-        "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountName/invoiceSections/invoiceSectionId/billingSubscriptions/subscriptionId/transfer/operationResults/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-11-01-preview",
+        "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/{billingSubscriptionName}/transfer/operationResults/10000000-0000-0000-0000-000000000001?api-version=2018-11-01-preview",
         "Retry-After": "30",
-        "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountName/invoiceSections/invoiceSectionId/billingSubscriptions/subscriptionId/transfer/operationStatus/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-11-01-preview"
+        "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/{billingSubscriptionName}/transfer/operationStatus/10000000-0000-0000-0000-000000000001?api-version=2018-11-01-preview"
       }
     }
   }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferProduct.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferProduct.json
index 50fed1191db9..50947f088709 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferProduct.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferProduct.json
@@ -2,22 +2,22 @@
   "parameters": {
     "api-version": "2018-11-01-preview",
     "billingAccountName": "{billingAccountName}",
-    "invoiceSectionName": "{invoiceSectionId1}",
-    "productName": "product1",
+    "invoiceSectionName": "{invoiceSectionName}",
+    "productName": "{productName}",
     "parameters": {
-      "destinationInvoiceSectionName": "/providers/Microsoft.Billing/billingAccounts/5660ed6e-7824-4795-a579-c0037e6c8da4/invoiceSections/2b2ff7ea-559c-41c0-adea-2550293e11e5"
+      "destinationInvoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{newInvoiceSectionName}"
     }
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId1",
-        "name": "productSummaryId1",
-        "type": "Microsoft.Consumption/products",
+        "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/{productName}",
+        "name": "{productName}",
+        "type": "Microsoft.Billing/products",
         "properties": {
           "productTypeId": "A12345",
           "productType": "Subscription",
-          "displayName": "AIP Dev",
+          "displayName": "Test Product",
           "status": "Active",
           "purchaseDate": "2018-05-01T17:32:28Z",
           "lastCharge": {
@@ -30,20 +30,20 @@
           "skuId": "0001",
           "skuDescription": "Enterprise Agreement Development",
           "availabilityId": "AvailabilityId1",
-          "parentProductId": "eligibleOffer2",
-          "invoiceSectionId": "42425",
+          "parentProductId": "45000000-0000-0000-0000-0000000001242",
+          "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{newInvoiceSectionName}",
           "invoiceSectionName": "Contoso operations invoiceSection",
-          "billingProfileId": "789456",
+          "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
           "billingProfileName": "Contoso operations billing"
         }
       }
     },
       "202": {
         "headers": {
-          "Location": "https://management.azure.com/providers/Microsoft.Billing/operationResults/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-11-01-preview",
+          "Location": "https://management.azure.com/providers/Microsoft.Billing/operationResults/44000000-0000-0000-0000-000000000000?api-version=2018-11-01-preview",
           "Retry-After": "60",
-          "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/operationStatus/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-11-01-preview",
-          "OData-EntityId": "84ae600f-763c-4a66-a8f0-4c497fc58d98"
+          "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/operationStatus/44000000-0000-0000-0000-000000000000?api-version=2018-11-01-preview",
+          "OData-EntityId": "44000000-0000-0000-0000-000000000000"
         }
       }
     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateBillingProfile.json
index c0c24e82b97f..e64dff01e2a3 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateBillingProfile.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateBillingProfile.json
@@ -1,13 +1,12 @@
 {
   "parameters": {
     "api-version": "2018-11-01-preview",
-    "billingAccountName": "2000100",
-    "billingProfileName": "BillingProfileId1",
+    "billingAccountName": "{billingAccountName}",
+    "billingProfileName": "{billingProfileName}",
     "parameters": {
       "properties": {
-        "displayName": "BillingProfileName1",
+        "displayName": "BillingProfile11",
         "poNumber": "ABC12345",
-        "billingAddress": "One Microsoft Way",
         "isClassic": false
       }
     }
@@ -21,23 +20,23 @@
     },
     "200": {
       "body": {
-        "id": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1",
-        "name": "BillingProfileId1",
+        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
+        "name": "{billingProfileName}",
         "type": "Microsoft.Billing/billingProfiles",
         "properties": {
-          "displayName": "BillingProfileName1",
-          "poNumber": "ABC12345",
-          "billingAddress": {
-            "addressLine1": "Test Address",
-            "addressLine2": "Test Address",
-            "addressLine3": "Test Address",
+          "displayName": "BillingProfile11",
+          "address": {
+            "companyName": "Contoso",
+            "firstName": "Test",
+            "lastName": "User",
+            "addressLine1": "Test Address1",
+            "addressLine2": "Test Address2",
+            "addressLine3": "Test Address3",
             "city": "City",
             "postalCode": "00000",
             "region": "WA",
             "country": "US"
           },
-          "invoiceEmailOptIn": true,
-          "isClassic": false,
           "currency": "USD",
           "enabledAzureSKUs": [
             {
@@ -48,7 +47,11 @@
               "skuId": "0002",
               "skuDescription": "Microsoft Azure Standard"
             }
-          ]
+          ],
+          "isClassic": false,
+          "invoiceDay": 5,
+          "invoiceEmailOptIn": true,
+          "poNumber": "ABC12345"
         }
       }
     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateInvoiceSection.json
index c0b5e2b4fa3b..7cdc4f32fdd2 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateInvoiceSection.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateInvoiceSection.json
@@ -2,28 +2,28 @@
   "parameters": {
     "api-version": "2018-11-01-preview",
     "billingAccountName": "{billingAccountName}",
-    "invoiceSectionName": "invoiceSectionId1",
+    "invoiceSectionName": "{invoiceSectionName}",
     "parameters": {
       "properties": {
-        "displayName": "invoiceSectionName1"
+        "displayName": "invoiceSection1"
       }
     }
   },
   "responses": {
     "202": {
       "headers": {
-        "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/operationResults/ed2975a8-8f77-43bb-a717-ace54326b14b?api-version=2018-07-31",
+        "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/operationResults/ed2975a8-8f77-43bb-a717-ace54326b14b?api-version=2018-11-01-preview",
         "Retry-After": "60",
-        "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/operationStatus/ed2975a8-8f77-43bb-a717-ace54326b14b?api-version=2018-07-31"
+        "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/operationStatus/ed2975a8-8f77-43bb-a717-ace54326b14b?api-version=2018-11-01-preview"
       }
     },
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1",
-        "name": "invoiceSectionId1",
+        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}",
+        "name": "{invoiceSectionName}",
         "type": "Microsoft.Billing/invoiceSections",
         "properties": {
-          "displayName": "invoiceSectionName1"
+          "displayName": "invoiceSection1"
         }
       }
     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdatePolicy.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdatePolicy.json
index 98f2373dd325..cbe94aae78da 100644
--- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdatePolicy.json
+++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdatePolicy.json
@@ -2,24 +2,26 @@
   "parameters": {
     "api-version": "2018-11-01-preview",
     "billingAccountName": "{billingAccountName}",
-    "billingProfileName": "BillingProfileId1",
+    "billingProfileName": "{billingProfileName}",
     "eTag": "\"1d34d012214157f\"",
     "parameters": {
       "properties": {
         "reservationPurchasesAllowed": true,
-        "marketplacePurchasesAllowed": false
+        "marketplacePurchasesAllowed": false,
+        "subscriptionOwnerCanViewCharges":  true
       }
     }
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1/policies/default",
-        "name": "latest",
+        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/policies/default",
+        "name": "default",
         "type": "Microsoft.Billing/policies",
         "properties": {
           "reservationPurchasesAllowed": true,
-          "marketplacePurchasesAllowed": true
+          "marketplacePurchasesAllowed": false,
+          "subscriptionOwnerCanViewCharges":  true
         }
       }
     }