diff --git a/Samples/HttpDataDownloaderSample/LinkedServices/HDInsightLinkedService.json b/Samples/HttpDataDownloaderSample/LinkedServices/HDInsightLinkedService.json
index 01834f70..44c65831 100644
--- a/Samples/HttpDataDownloaderSample/LinkedServices/HDInsightLinkedService.json
+++ b/Samples/HttpDataDownloaderSample/LinkedServices/HDInsightLinkedService.json
@@ -1,11 +1,12 @@
 {
-    "name": "HDInsightLinkedService",
-    "properties": 
-    {
-        "type": "HDInsightBYOCLinkedService",
-        "clusterUri": "<>",
-        "userName": "<>",
-        "password": "<>",
-        "linkedServiceName": "RawEventsLinkedService"
+  "name": "HDInsightLinkedService",
+  "properties": {
+    "type": "HDInsight",
+    "typeProperties": {
+      "clusterUri": "<>",
+      "userName": "<>",
+      "password": "<>",
+      "linkedServiceName": "RawEventsLinkedService"
     }
+  }
 }
\ No newline at end of file
diff --git a/Samples/HttpDataDownloaderSample/LinkedServices/RawEventsLinkedService.json b/Samples/HttpDataDownloaderSample/LinkedServices/RawEventsLinkedService.json
index 41d4dd39..5f279c0a 100644
--- a/Samples/HttpDataDownloaderSample/LinkedServices/RawEventsLinkedService.json
+++ b/Samples/HttpDataDownloaderSample/LinkedServices/RawEventsLinkedService.json
@@ -1,8 +1,9 @@
 {
-    "name": "RawEventsLinkedService",
-    "properties":
-    {
-        "type": "AzureStorageLinkedService",
-        "connectionString": "DefaultEndpointsProtocol=https;AccountName=<>;AccountKey=<>"
+  "name": "RawEventsLinkedService",
+  "properties": {
+    "type": "AzureStorage",
+    "typeProperties": {
+      "connectionString": "DefaultEndpointsProtocol=https;AccountName=<>;AccountKey=<>"
     }
-}
+  }
+}
\ No newline at end of file
diff --git a/Samples/HttpDataDownloaderSample/Pipelines/DataDownloaderSamplePipeline.json b/Samples/HttpDataDownloaderSample/Pipelines/DataDownloaderSamplePipeline.json
index 6bbfa3cc..75e60022 100644
--- a/Samples/HttpDataDownloaderSample/Pipelines/DataDownloaderSamplePipeline.json
+++ b/Samples/HttpDataDownloaderSample/Pipelines/DataDownloaderSamplePipeline.json
@@ -1,41 +1,40 @@
 {
-    "name": "DataDownloaderSamplePipeline",
-    "properties":
-    {
-        "description" : "Custom Data Downloader from an HTTP EndPoint Sample Pipeline",
-        "activities":
-        [
-           {
-                "name": "DownloadData",
-                "description": "Download raw data from an http endpoint",                
-                "outputs": [ {"name": "RawEventsTable"} ],
-                "linkedServiceName": "HDInsightLinkedService",
-                "type": "DotNetActivity",
-                "transformation":
-                {
-                    "assemblyName": "DataDownloaderActivity.dll",
-                    "entryPoint": "DataDownloaderActivityNS.DataDownloaderActivity",
-                    "packageLinkedService": "RawEventsLinkedService",
-                    "packageFile": "<container>/package/DataDownloaderActivity.zip",
-                    "extendedProperties":
-                    {
-                        "sliceStart": "$$Text.Format('{0:yyyyMMddHHmm}', Time.AddMinutes(SliceStart, 0))",
-                        "urlFormat": "http://dumps.wikimedia.org/other/pagecounts-raw/{0}/{0}-{1}/pagecounts-{0}{1}{2}-{3}00{4}.gz",
-                        "dataStorageAccountName": "<>",
-                        "dataStorageAccountKey": "<>",
-                        "dataStorageContainer": "<>",
-                    }
-                },
-                "policy":
-                {
-                    "concurrency": 1,
-                    "executionPriorityOrder": "OldestFirst",
-                    "retry": 2,
-                    "timeout": "00:30:00"
-                },                
-            },		
+  "name": "DataDownloaderSamplePipeline",
+  "properties": {
+    "description": "Custom Data Downloader from an HTTP EndPoint Sample Pipeline",
+    "activities": [
+      {
+        "name": "DownloadData",
+        "description": "Download raw data from an http endpoint",
+        "outputs": [
+          {
+            "name": "RawEventsTable"
+          }
         ],
-        "start": "2015-03-08T00:00:00Z",
-        "end": "9999-09-09T00:00:00Z"
-    }
-}
+        "linkedServiceName": "HDInsightLinkedService",
+        "type": "DotNetActivity",
+        "typeProperties": {
+          "assemblyName": "DataDownloaderActivity.dll",
+          "entryPoint": "DataDownloaderActivityNS.DataDownloaderActivity",
+          "packageLinkedService": "RawEventsLinkedService",
+          "packageFile": "<container>/package/DataDownloaderActivity.zip",
+          "defines": {
+            "sliceStart": "$$Text.Format('{0:yyyyMMddHHmm}', Time.AddMinutes(SliceStart, 0))",
+            "urlFormat": "http://dumps.wikimedia.org/other/pagecounts-raw/{0}/{0}-{1}/pagecounts-{0}{1}{2}-{3}00{4}.gz",
+            "dataStorageAccountName": "<>",
+            "dataStorageAccountKey": "<>",
+            "dataStorageContainer": "<>"
+          }
+        },
+        "policy": {
+          "concurrency": 1,
+          "executionPriorityOrder": "OldestFirst",
+          "retry": 2,
+          "timeout": "00:30:00"
+        }
+      }
+    ],
+    "start": "2015-03-08T00:00:00Z",
+    "end": "9999-09-09T00:00:00Z"
+  }
+}
\ No newline at end of file
diff --git a/Samples/HttpDataDownloaderSample/Tables/RawEventsTable.json b/Samples/HttpDataDownloaderSample/Tables/RawEventsTable.json
index 6087a570..026653ad 100644
--- a/Samples/HttpDataDownloaderSample/Tables/RawEventsTable.json
+++ b/Samples/HttpDataDownloaderSample/Tables/RawEventsTable.json
@@ -1,24 +1,24 @@
-{  
-   "name":"RawEventsTable",
-   "properties":{  
-      "location":{  
-         "type":"AzureBlobLocation",
-         "folderPath":"<Container>/httpDownloadDataIn/{Slice}/",
-         "partitionedBy":[  
-            {  
-               "name":"Slice",
-               "value":{  
-                  "type":"DateTime",
-                  "date":"SliceStart",
-                  "format":"yyyyMMddHHmm"
-               }
-            }
-         ],
-         "linkedServiceName":"RawEventsLinkedService"
-      },
-      "availability":{  
-         "frequency":"Hour",
-         "interval":1
-      }
-   }
-}
+{
+  "name": "RawEventsTable",
+  "properties": {
+    "type": "AzureBlob",
+    "linkedServiceName": "RawEventsLinkedService",
+    "typeProperties": {
+      "folderPath": "<Container>/httpDownloadDataIn/{Slice}/",
+      "partitionedBy": [
+        {
+          "name": "Slice",
+          "value": {
+            "type": "DateTime",
+            "date": "SliceStart",
+            "format": "yyyyMMddHHmm"
+          }
+        }
+      ]
+    },
+    "availability": {
+      "frequency": "Hour",
+      "interval": 1
+    }
+  }
+}
\ No newline at end of file