diff --git a/Microsoft.Azure.Cosmos.Samples/CodeSamples/ContainerManagement/Program.cs b/Microsoft.Azure.Cosmos.Samples/CodeSamples/ContainerManagement/Program.cs
index cb2c4119f5..cdbdb57f1b 100644
--- a/Microsoft.Azure.Cosmos.Samples/CodeSamples/ContainerManagement/Program.cs
+++ b/Microsoft.Azure.Cosmos.Samples/CodeSamples/ContainerManagement/Program.cs
@@ -179,7 +179,7 @@ private static async Task ListContainersInDatabase()
         {
             Console.WriteLine("\n5. Reading all CosmosContainer resources for a database");
 
-            CosmosFeedIterator<CosmosContainerSettings> resultSetIterator = database.Containers.GetContainerIterator();
+            CosmosResultSetIterator<CosmosContainerSettings> resultSetIterator = database.Containers.GetContainerIterator();
             while (resultSetIterator.HasMoreResults)
             {
                 foreach (CosmosContainerSettings container in await resultSetIterator.FetchNextSetAsync())
diff --git a/Microsoft.Azure.Cosmos.Samples/CodeSamples/DatabaseManagement/Program.cs b/Microsoft.Azure.Cosmos.Samples/CodeSamples/DatabaseManagement/Program.cs
index c9f0a69eb8..398f0a40f6 100644
--- a/Microsoft.Azure.Cosmos.Samples/CodeSamples/DatabaseManagement/Program.cs
+++ b/Microsoft.Azure.Cosmos.Samples/CodeSamples/DatabaseManagement/Program.cs
@@ -90,7 +90,7 @@ private static async Task RunDatabaseDemo(CosmosClient client)
             }
 
             Console.WriteLine("\n5. Reading all databases resources for an account");
-            CosmosFeedIterator<CosmosDatabaseSettings> iterator = client.Databases.GetDatabaseIterator();
+            CosmosResultSetIterator<CosmosDatabaseSettings> iterator = client.Databases.GetDatabaseIterator();
             do
             {
                 foreach (CosmosDatabaseSettings db in await iterator.FetchNextSetAsync())
diff --git a/Microsoft.Azure.Cosmos.Samples/CodeSamples/Handlers/Program.cs b/Microsoft.Azure.Cosmos.Samples/CodeSamples/Handlers/Program.cs
index df96e0c29c..4430ed1d00 100644
--- a/Microsoft.Azure.Cosmos.Samples/CodeSamples/Handlers/Program.cs
+++ b/Microsoft.Azure.Cosmos.Samples/CodeSamples/Handlers/Program.cs
@@ -80,11 +80,11 @@ public static async Task Main(string[] args)
             await container.Items.ReplaceItemAsync<Item>(item.Id, item.Id, item);
 
             // Querying
-            CosmosFeedIterator<Item> query = container.Items.CreateItemQuery<Item>(new CosmosSqlQueryDefinition("SELECT * FROM c"), maxConcurrency: 1);
+            CosmosResultSetIterator<Item> query = container.Items.CreateItemQuery<Item>(new CosmosSqlQueryDefinition("SELECT * FROM c"), maxConcurrency: 1);
             List<Item> results = new List<Item>();
             while (query.HasMoreResults)
             {
-                CosmosFeedResponse<Item> response = await query.FetchNextSetAsync();
+                CosmosQueryResponse<Item> response = await query.FetchNextSetAsync();
 
                 results.AddRange(response.ToList());
             }
diff --git a/Microsoft.Azure.Cosmos.Samples/CodeSamples/ItemManagement/Program.cs b/Microsoft.Azure.Cosmos.Samples/CodeSamples/ItemManagement/Program.cs
index 0f594133be..d7e76dadb7 100644
--- a/Microsoft.Azure.Cosmos.Samples/CodeSamples/ItemManagement/Program.cs
+++ b/Microsoft.Azure.Cosmos.Samples/CodeSamples/ItemManagement/Program.cs
@@ -235,7 +235,7 @@ private static async Task QueryItems()
                 "select * from sales s where s.AccountNumber = @AccountInput ")
                 .UseParameter("@AccountInput", "Account1");
 
-            CosmosFeedIterator<SalesOrder> resultSet = container.Items.CreateItemQuery<SalesOrder>(
+            CosmosResultSetIterator<SalesOrder> resultSet = container.Items.CreateItemQuery<SalesOrder>(
                 query,
                 partitionKey: "Account1",
                 maxItemCount: 1);
@@ -251,7 +251,7 @@ private static async Task QueryItems()
             Console.WriteLine($"\n1.4.2 Query found {allSalesForAccount1.Count} items.");
 
             // Use the same query as before but get the cosmos response message to access the stream directly
-            CosmosFeedIterator streamResultSet = container.Items.CreateItemQueryAsStream(
+            CosmosResultSetIterator streamResultSet = container.Items.CreateItemQueryAsStream(
                 query,
                 maxConcurrency: 1,
                 partitionKey: "Account1",
@@ -260,10 +260,10 @@ private static async Task QueryItems()
             List<SalesOrder> allSalesForAccount1FromStream = new List<SalesOrder>();
             while (streamResultSet.HasMoreResults)
             {
-                using (CosmosResponseMessage responseMessage = await streamResultSet.FetchNextSetAsync())
+                using (CosmosQueryResponse responseMessage = await streamResultSet.FetchNextSetAsync())
                 {
                     // Item stream operations do not throw exceptions for better performance
-                    if (responseMessage.IsSuccessStatusCode)
+                    if (responseMessage.IsSuccess)
                     {
                         dynamic streamResponse = FromStream<dynamic>(responseMessage.Content);
                         List<SalesOrder> salesOrders = streamResponse.ToObject<List<SalesOrder>>();
diff --git a/Microsoft.Azure.Cosmos.Samples/CodeSamples/NuGet.config b/Microsoft.Azure.Cosmos.Samples/CodeSamples/NuGet.config
new file mode 100644
index 0000000000..cbb81b2617
--- /dev/null
+++ b/Microsoft.Azure.Cosmos.Samples/CodeSamples/NuGet.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
+ </packageSources>
+</configuration>
diff --git a/Microsoft.Azure.Cosmos.Samples/CodeSamples/Queries/Program.cs b/Microsoft.Azure.Cosmos.Samples/CodeSamples/Queries/Program.cs
index 708ce3b1d7..6a30337967 100644
--- a/Microsoft.Azure.Cosmos.Samples/CodeSamples/Queries/Program.cs
+++ b/Microsoft.Azure.Cosmos.Samples/CodeSamples/Queries/Program.cs
@@ -96,7 +96,7 @@ private static async Task ItemFeed(CosmosContainer container)
             List<Family> families = new List<Family>();
 
             // SQL
-            CosmosFeedIterator<Family> setIterator = container.Items.GetItemIterator<Family>(maxItemCount: 1);
+            CosmosResultSetIterator<Family> setIterator = container.Items.GetItemIterator<Family>(maxItemCount: 1);
             while (setIterator.HasMoreResults)
             {
                 int count = 0;
@@ -115,7 +115,7 @@ private static async Task ItemStreamFeed(CosmosContainer container)
             int totalCount = 0;
 
             // SQL
-            CosmosFeedIterator setIterator = container.Items.GetItemStreamIterator();
+            CosmosFeedResultSetIterator setIterator = container.Items.GetItemStreamIterator();
             while (setIterator.HasMoreResults)
             {
                 int count = 0;
@@ -140,7 +140,7 @@ private static async Task ItemStreamFeed(CosmosContainer container)
         private static async Task QueryItemsInPartitionAsStreams(CosmosContainer container)
         {
             // SQL
-            CosmosFeedIterator setIterator = container.Items.CreateItemQueryAsStream(
+            CosmosResultSetIterator setIterator = container.Items.CreateItemQueryAsStream(
                 "SELECT F.id, F.LastName, F.IsRegistered FROM Families F",
                 partitionKey: "Anderson",
                 maxConcurrency: 1,
@@ -149,9 +149,9 @@ private static async Task QueryItemsInPartitionAsStreams(CosmosContainer contain
             int count = 0;
             while (setIterator.HasMoreResults)
             {
-                using (CosmosResponseMessage response = await setIterator.FetchNextSetAsync())
+                using (CosmosQueryResponse response = await setIterator.FetchNextSetAsync())
                 {
-                    Assert("Response failed", response.IsSuccessStatusCode);
+                    Assert("Response failed", response.IsSuccess);
                     count++;
                     using (StreamReader sr = new StreamReader(response.Content))
                     using (JsonTextReader jtr = new JsonTextReader(sr))
@@ -178,7 +178,7 @@ private static async Task QueryWithSqlParameters(CosmosContainer container)
                 .UseParameter("@city", "Seattle");
 
             List<Family> results = new List<Family>();
-            CosmosFeedIterator<Family> resultSetIterator = container.Items.CreateItemQuery<Family>(query, partitionKey: "Anderson");
+            CosmosResultSetIterator<Family> resultSetIterator = container.Items.CreateItemQuery<Family>(query, partitionKey: "Anderson");
             while (resultSetIterator.HasMoreResults)
             {
                 results.AddRange((await resultSetIterator.FetchNextSetAsync()));
@@ -195,7 +195,7 @@ private static async Task QueryPartitionedContainerInParallelAsync(CosmosContain
             // 0 maximum parallel tasks, effectively serial execution
             CosmosQueryRequestOptions options = new CosmosQueryRequestOptions() { MaxBufferedItemCount = 100 };
 
-            CosmosFeedIterator<Family> query = container.Items.CreateItemQuery<Family>(
+            CosmosResultSetIterator<Family> query = container.Items.CreateItemQuery<Family>(
                 queryText,
                 maxConcurrency: 0,
                 requestOptions: options);
diff --git a/Microsoft.Azure.Cosmos.Samples/CodeSamples/ServerSideScripts/Program.cs b/Microsoft.Azure.Cosmos.Samples/CodeSamples/ServerSideScripts/Program.cs
index f22f2d1c63..811b19a9bc 100644
--- a/Microsoft.Azure.Cosmos.Samples/CodeSamples/ServerSideScripts/Program.cs
+++ b/Microsoft.Azure.Cosmos.Samples/CodeSamples/ServerSideScripts/Program.cs
@@ -182,10 +182,10 @@ private static async Task RunBulkImport(CosmosContainer container)
             // 8. Validate
             int numDocs = 0;
 
-            CosmosFeedIterator<dynamic> setIterator = container.Items.GetItemIterator<dynamic>();
+            CosmosResultSetIterator<dynamic> setIterator = container.Items.GetItemIterator<dynamic>();
             while (setIterator.HasMoreResults)
             {
-                CosmosFeedResponse<dynamic> response = await setIterator.FetchNextSetAsync();
+                CosmosQueryResponse<dynamic> response = await setIterator.FetchNextSetAsync();
                 numDocs += response.Count();
             }