diff --git a/src/ResourceManagement/Resource/ResourceManagement/Generated/DeploymentOperationOperations.cs b/src/ResourceManagement/Resource/ResourceManagement/Generated/DeploymentOperationOperations.cs
index 325b8a6eef5f..542aa8fbaf6b 100644
--- a/src/ResourceManagement/Resource/ResourceManagement/Generated/DeploymentOperationOperations.cs
+++ b/src/ResourceManagement/Resource/ResourceManagement/Generated/DeploymentOperationOperations.cs
@@ -547,11 +547,11 @@ public async Task<DeploymentOperationsListResult> ListAsync(string resourceGroup
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
@@ -765,11 +765,11 @@ public async Task<DeploymentOperationsListResult> ListNextAsync(string nextLink,
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
diff --git a/src/ResourceManagement/Resource/ResourceManagement/Generated/DeploymentOperations.cs b/src/ResourceManagement/Resource/ResourceManagement/Generated/DeploymentOperations.cs
index 939e0ee14dab..e20297ba5c79 100644
--- a/src/ResourceManagement/Resource/ResourceManagement/Generated/DeploymentOperations.cs
+++ b/src/ResourceManagement/Resource/ResourceManagement/Generated/DeploymentOperations.cs
@@ -1930,11 +1930,11 @@ public async Task<DeploymentListResult> ListAsync(string resourceGroupName, Depl
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
@@ -2322,11 +2322,11 @@ public async Task<DeploymentListResult> ListNextAsync(string nextLink, Cancellat
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
diff --git a/src/ResourceManagement/Resource/ResourceManagement/Generated/Features.cs b/src/ResourceManagement/Resource/ResourceManagement/Generated/Features.cs
index abeee6ac3311..524cdfa6f98b 100644
--- a/src/ResourceManagement/Resource/ResourceManagement/Generated/Features.cs
+++ b/src/ResourceManagement/Resource/ResourceManagement/Generated/Features.cs
@@ -412,11 +412,11 @@ public async Task<FeatureOperationsListResult> ListAsync(string resourceProvider
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
@@ -602,11 +602,11 @@ public async Task<FeatureOperationsListResult> ListAllAsync(CancellationToken ca
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
@@ -778,11 +778,11 @@ public async Task<FeatureOperationsListResult> ListAllNextAsync(string nextLink,
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
@@ -954,11 +954,11 @@ public async Task<FeatureOperationsListResult> ListNextAsync(string nextLink, Ca
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
diff --git a/src/ResourceManagement/Resource/ResourceManagement/Generated/ManagementLockOperations.cs b/src/ResourceManagement/Resource/ResourceManagement/Generated/ManagementLockOperations.cs
index ca3cfee69664..d1fee8fca436 100644
--- a/src/ResourceManagement/Resource/ResourceManagement/Generated/ManagementLockOperations.cs
+++ b/src/ResourceManagement/Resource/ResourceManagement/Generated/ManagementLockOperations.cs
@@ -1616,11 +1616,11 @@ public async Task<ManagementLockListResult> ListAtResourceGroupLevelAsync(string
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
@@ -1882,11 +1882,11 @@ public async Task<ManagementLockListResult> ListAtResourceLevelAsync(string reso
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
@@ -2092,11 +2092,11 @@ public async Task<ManagementLockListResult> ListAtSubscriptionLevelAsync(Managem
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
@@ -2275,11 +2275,11 @@ public async Task<ManagementLockListResult> ListNextAsync(string nextLink, Cance
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
diff --git a/src/ResourceManagement/Resource/ResourceManagement/Generated/ProviderOperations.cs b/src/ResourceManagement/Resource/ResourceManagement/Generated/ProviderOperations.cs
index 5f94ae1664e9..fdf52b0d971e 100644
--- a/src/ResourceManagement/Resource/ResourceManagement/Generated/ProviderOperations.cs
+++ b/src/ResourceManagement/Resource/ResourceManagement/Generated/ProviderOperations.cs
@@ -468,11 +468,11 @@ public async Task<ProviderListResult> ListAsync(ProviderListParameters parameter
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
@@ -676,11 +676,11 @@ public async Task<ProviderListResult> ListNextAsync(string nextLink, Cancellatio
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
diff --git a/src/ResourceManagement/Resource/ResourceManagement/Generated/ResourceGroupOperations.cs b/src/ResourceManagement/Resource/ResourceManagement/Generated/ResourceGroupOperations.cs
index 32349bd68966..285c26538f64 100644
--- a/src/ResourceManagement/Resource/ResourceManagement/Generated/ResourceGroupOperations.cs
+++ b/src/ResourceManagement/Resource/ResourceManagement/Generated/ResourceGroupOperations.cs
@@ -1110,11 +1110,11 @@ public async Task<ResourceGroupListResult> ListAsync(ResourceGroupListParameters
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
@@ -1308,11 +1308,11 @@ public async Task<ResourceGroupListResult> ListNextAsync(string nextLink, Cancel
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
diff --git a/src/ResourceManagement/Resource/ResourceManagement/Generated/ResourceOperations.cs b/src/ResourceManagement/Resource/ResourceManagement/Generated/ResourceOperations.cs
index cb926fa3c24d..0728b24d9743 100644
--- a/src/ResourceManagement/Resource/ResourceManagement/Generated/ResourceOperations.cs
+++ b/src/ResourceManagement/Resource/ResourceManagement/Generated/ResourceOperations.cs
@@ -1329,11 +1329,11 @@ public async Task<ResourceListResult> ListAsync(ResourceListParameters parameter
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
@@ -1569,11 +1569,11 @@ public async Task<ResourceListResult> ListNextAsync(string nextLink, Cancellatio
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
diff --git a/src/ResourceManagement/Resource/ResourceManagement/Generated/TagOperations.cs b/src/ResourceManagement/Resource/ResourceManagement/Generated/TagOperations.cs
index 349980380bf8..b31b29dfc313 100644
--- a/src/ResourceManagement/Resource/ResourceManagement/Generated/TagOperations.cs
+++ b/src/ResourceManagement/Resource/ResourceManagement/Generated/TagOperations.cs
@@ -956,11 +956,11 @@ public async Task<TagsListResult> ListAsync(CancellationToken cancellationToken)
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
@@ -1177,11 +1177,11 @@ public async Task<TagsListResult> ListNextAsync(string nextLink, CancellationTok
                                 }
                             }
                             
-                            JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
-                            if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
+                            JToken nextLinkValue = responseDoc["nextLink"];
+                            if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
                             {
-                                string odatanextLinkInstance = ((string)odatanextLinkValue);
-                                result.NextLink = odatanextLinkInstance;
+                                string nextLinkInstance = ((string)nextLinkValue);
+                                result.NextLink = nextLinkInstance;
                             }
                         }
                         
diff --git a/src/ResourceManagement/Resource/ResourceManagement/Microsoft.Azure.Management.Resources.nuget.proj b/src/ResourceManagement/Resource/ResourceManagement/Microsoft.Azure.Management.Resources.nuget.proj
index 560d524fc7e2..70262b92b6f3 100644
--- a/src/ResourceManagement/Resource/ResourceManagement/Microsoft.Azure.Management.Resources.nuget.proj
+++ b/src/ResourceManagement/Resource/ResourceManagement/Microsoft.Azure.Management.Resources.nuget.proj
@@ -5,7 +5,7 @@
     Microsoft.Azure.Management.Resources
     -->
     <SdkNuGetPackage Include="Microsoft.Azure.Management.Resources">
-      <PackageVersion>2.18.6-preview</PackageVersion>
+      <PackageVersion>2.18.7-preview</PackageVersion>
       <Folder>$(MSBuildThisFileDirectory)</Folder>
     </SdkNuGetPackage>
   </ItemGroup>
diff --git a/src/ResourceManagement/Resource/ResourceManagement/Properties/AssemblyInfo.cs b/src/ResourceManagement/Resource/ResourceManagement/Properties/AssemblyInfo.cs
index d594b664edec..7ea6b6906021 100644
--- a/src/ResourceManagement/Resource/ResourceManagement/Properties/AssemblyInfo.cs
+++ b/src/ResourceManagement/Resource/ResourceManagement/Properties/AssemblyInfo.cs
@@ -21,7 +21,7 @@
 [assembly: AssemblyDescription("Provides Microsoft Azure resource management operations including Resource Groups.")]
 
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.18.6.0")]
+[assembly: AssemblyFileVersion("2.18.7.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("Azure .NET SDK")]
diff --git a/src/ResourceManagement/Resource/Resources.Tests/InMemoryTests/DeploymentTests.InMemory.cs b/src/ResourceManagement/Resource/Resources.Tests/InMemoryTests/DeploymentTests.InMemory.cs
index 01899be0627a..9401193a6a1c 100644
--- a/src/ResourceManagement/Resource/Resources.Tests/InMemoryTests/DeploymentTests.InMemory.cs
+++ b/src/ResourceManagement/Resource/Resources.Tests/InMemoryTests/DeploymentTests.InMemory.cs
@@ -177,7 +177,7 @@ public void ListDeploymentOperationsReturnsMultipleObjects()
                           }
                        }
                     ],
-                    '@odata.nextLink': 'https://wa.com/subscriptions/mysubid/resourcegroups/TestRG/deployments/test-release-3/operations?$skiptoken=983fknw'
+                    'nextLink': 'https://wa.com/subscriptions/mysubid/resourcegroups/TestRG/deployments/test-release-3/operations?$skiptoken=983fknw'
                     }
 ")
             };
@@ -212,7 +212,7 @@ public void ListDeploymentOperationsReturnsEmptyArray()
                 {
                     Content = new StringContent(@"{
                     'value': [],
-                    '@odata.nextLink': 'https://wa.com/subscriptions/mysubid/resourcegroups/TestRG/deployments/test-release-3/operations?$skiptoken=983fknw'
+                    'nextLink': 'https://wa.com/subscriptions/mysubid/resourcegroups/TestRG/deployments/test-release-3/operations?$skiptoken=983fknw'
                     }")
                 };
 
@@ -353,7 +353,7 @@ public void ListDeploymentOperationsWorksWithNextLink()
                           }
                        }
                     ],
-                    '@odata.nextLink': 'https://wa.com/subscriptions/mysubid/resourcegroups/TestRG/deployments/test-release-3/operations?$skiptoken=983fknw'
+                    'nextLink': 'https://wa.com/subscriptions/mysubid/resourcegroups/TestRG/deployments/test-release-3/operations?$skiptoken=983fknw'
                     }
 ")
             };
@@ -834,7 +834,7 @@ public void DeploymentTestsListAllValidateMessage()
                         }
                       }
                     ],
-                    '@odata.nextLink': 'https://wa/subscriptions/subId/templateDeployments?$skiptoken=983fknw' 
+                    'nextLink': 'https://wa/subscriptions/subId/templateDeployments?$skiptoken=983fknw' 
                 }")
             };
             var handler = new RecordedDelegatingHandler(response) { StatusCodeToReturn = HttpStatusCode.OK };
@@ -941,7 +941,7 @@ public void DeploymentTestsListValidateMessage()
                         }
                       }
                     ],
-                    '@odata.nextLink': 'https://wa/subscriptions/subId/templateDeployments?$skiptoken=983fknw' 
+                    'nextLink': 'https://wa/subscriptions/subId/templateDeployments?$skiptoken=983fknw' 
                 }")
             };
             var handler = new RecordedDelegatingHandler(response) { StatusCodeToReturn = HttpStatusCode.OK };
@@ -1054,7 +1054,7 @@ public void DeploymentTestsListForGroupValidateMessage()
                         }
                       }
                     ],
-                    '@odata.nextLink': 'https://wa/subscriptions/subId/templateDeployments?$skiptoken=983fknw' 
+                    'nextLink': 'https://wa/subscriptions/subId/templateDeployments?$skiptoken=983fknw' 
                 }")
             };
             var handler = new RecordedDelegatingHandler(response) { StatusCodeToReturn = HttpStatusCode.OK };
diff --git a/src/ResourceManagement/Resource/Resources.Tests/InMemoryTests/FeatureTests.InMemory.cs b/src/ResourceManagement/Resource/Resources.Tests/InMemoryTests/FeatureTests.InMemory.cs
index ecd534fe2cce..7dfc2cbf757c 100644
--- a/src/ResourceManagement/Resource/Resources.Tests/InMemoryTests/FeatureTests.InMemory.cs
+++ b/src/ResourceManagement/Resource/Resources.Tests/InMemoryTests/FeatureTests.InMemory.cs
@@ -184,7 +184,7 @@ public void ListPreviewedFeatures()
                     'type': 'Microsoft.Features/providers/features'   
                 }
                 ],
-              '@odata.nextLink': 'https://wa.com/subscriptions/mysubid/resourcegroups/TestRG/deployments/test-release-3/operations?$skiptoken=983fknw'
+              'nextLink': 'https://wa.com/subscriptions/mysubid/resourcegroups/TestRG/deployments/test-release-3/operations?$skiptoken=983fknw'
               }
             ")
             };
@@ -247,7 +247,7 @@ public void ListAllPreviewedFeatures()
                     'type': 'Microsoft.Features/providers/features'   
                 }            
                 ],
-              '@odata.nextLink': 'https://wa.com/subscriptions/mysubid/resourcegroups/TestRG/deployments/test-release-3/operations?$skiptoken=983fknw'
+              'nextLink': 'https://wa.com/subscriptions/mysubid/resourcegroups/TestRG/deployments/test-release-3/operations?$skiptoken=983fknw'
               }
             ")
             };
diff --git a/src/ResourceManagement/Resource/Resources.Tests/InMemoryTests/ResourceGroupTests.InMemory.cs b/src/ResourceManagement/Resource/Resources.Tests/InMemoryTests/ResourceGroupTests.InMemory.cs
index 937dcac13b72..dcb88503e24c 100644
--- a/src/ResourceManagement/Resource/Resources.Tests/InMemoryTests/ResourceGroupTests.InMemory.cs
+++ b/src/ResourceManagement/Resource/Resources.Tests/InMemoryTests/ResourceGroupTests.InMemory.cs
@@ -282,7 +282,7 @@ public void ResourceGroupListAllValidateMessage()
                       }
                     } 
                 ], 
-                '@odata.nextLink': 'https://wa/subscriptions/subId/resourcegroups?api-version=1.0&$skiptoken=662idk',
+                'nextLink': 'https://wa/subscriptions/subId/resourcegroups?api-version=1.0&$skiptoken=662idk',
                 }")
             };
             response.Headers.Add("x-ms-request-id", "1");
@@ -368,7 +368,7 @@ public void ResourceGroupListValidateMessage()
                     'locked': 'false' 
                     } 
                 ], 
-                '@odata.nextLink': 'https://wa/subscriptions/subId/resourcegroups?api-version=1.0&$skiptoken=662idk',
+                'nextLink': 'https://wa/subscriptions/subId/resourcegroups?api-version=1.0&$skiptoken=662idk',
                 }")
             };
             response.Headers.Add("x-ms-request-id", "1");