diff --git a/samples/features/machine-learning-services/python/getting-started/predictive-model/README.md b/samples/features/machine-learning-services/python/getting-started/rental-prediction/README.md
similarity index 98%
rename from samples/features/machine-learning-services/python/getting-started/predictive-model/README.md
rename to samples/features/machine-learning-services/python/getting-started/rental-prediction/README.md
index 90502e59..d5b154c4 100644
--- a/samples/features/machine-learning-services/python/getting-started/predictive-model/README.md
+++ b/samples/features/machine-learning-services/python/getting-started/rental-prediction/README.md
@@ -60,10 +60,10 @@ Saves the predicted results to a DB table </br>
 
 This sample shows how to create a predictive model with Python and generate predictions using the model and deploy that in SQL Server with SQL Server Machine Learning Services. 
 
-### predictive_model.py
+### rental_prediction.py
 The Python script that generates a predictive model and uses it to predict rental counts
 
-### predictive_model_python.sql
+###  rental_prediction.sql
 Takes the Python code in Predictive Model.py and deploys it inside SQL Server. Creating stored procedures and tables for training, storing models and creating stored procedures for prediction.
 
 
diff --git a/samples/features/machine-learning-services/python/getting-started/predictive-model/predictive_model.py b/samples/features/machine-learning-services/python/getting-started/rental-prediction/rental_prediction.py
similarity index 95%
rename from samples/features/machine-learning-services/python/getting-started/predictive-model/predictive_model.py
rename to samples/features/machine-learning-services/python/getting-started/rental-prediction/rental_prediction.py
index bcdbdd17..9e5b6e1e 100644
--- a/samples/features/machine-learning-services/python/getting-started/predictive-model/predictive_model.py
+++ b/samples/features/machine-learning-services/python/getting-started/rental-prediction/rental_prediction.py
@@ -8,7 +8,7 @@ from revoscalepy.etl.RxImport import rx_import_datasource
 
 
 def get_rental_predictions():
-    conn_str = 'Driver=SQL Server;Server=NELLIELAPTOP\\SQLSERVER20;Database=TutorialDB;Trusted_Connection=True;'
+    conn_str = 'Driver=SQL Server;Server=MYSQLSERVER;Database=TutorialDB;Trusted_Connection=True;'
     column_info = { 
             "Year" : { "type" : "integer" },
             "Month" : { "type" : "integer" }, 
diff --git a/samples/features/machine-learning-services/python/getting-started/predictive-model/predictive_model_python.sql b/samples/features/machine-learning-services/python/getting-started/rental-prediction/rental_prediction.sql
similarity index 97%
rename from samples/features/machine-learning-services/python/getting-started/predictive-model/predictive_model_python.sql
rename to samples/features/machine-learning-services/python/getting-started/rental-prediction/rental_prediction.sql
index 798608b8..bd36334f 100644
--- a/samples/features/machine-learning-services/python/getting-started/predictive-model/predictive_model_python.sql
+++ b/samples/features/machine-learning-services/python/getting-started/rental-prediction/rental_prediction.sql
@@ -26,9 +26,8 @@ BEGIN
     EXECUTE sp_execute_external_script
       @language = N'Python'
     , @script = N'
-import pandas as pd   
-df = pd.DataFrame(rental_train_data)
-print(df)
+
+df = rental_train_data
 
 # Get all the columns from the dataframe.
 columns = df.columns.tolist()
@@ -84,8 +83,8 @@ BEGIN
 import pickle
 rental_model = pickle.loads(py_model)
 
-import pandas as pd   
-df = pd.DataFrame(rental_score_data)
+  
+df = rental_score_data
 #print(df)
 
 # Get all the columns from the dataframe.
diff --git a/samples/features/r-services/README.md b/samples/features/r-services/README.md
index 58fa175d..70de256a 100644
--- a/samples/features/r-services/README.md
+++ b/samples/features/r-services/README.md
@@ -1,8 +1,6 @@
-# Samples for SQL Server R Services
+# Samples for SQL Server Machine Learning Services
+
 
-Go to the getting started tutorials to learn more about:
-[Predictive Modeling with R Services](https://www.microsoft.com/en-us/sql-server/developer-get-started/rprediction) 
-[Customer Clustering with R Services](https://www.microsoft.com/en-us/sql-server/developer-get-started/rclustering) 
 
 [Telco Customer Churn](Telco Customer Churn)
 
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/Predictive Model.R b/samples/features/r-services/getting-started/rental-prediction/Predictive Model.R
similarity index 97%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/Predictive Model.R
rename to samples/features/r-services/getting-started/rental-prediction/Predictive Model.R
index e0f4fb1b..67863524 100644
--- a/samples/features/r-services/Getting-Started/Predictive-Modeling/Predictive Model.R	
+++ b/samples/features/r-services/getting-started/rental-prediction/Predictive Model.R	
@@ -2,7 +2,7 @@
 ##################### STEP1 - Connect to DB and read data ####################
 
 #Connection string to connect to SQL Server named instance
-connStr <- paste("Driver=SQL Server; Server=", "NELLIELAPTOP\\VNEXTCTP14", 
+connStr <- paste("Driver=SQL Server; Server=", "MYSQLSERVER", 
                 ";Database=", "Tutorialdb", ";Trusted_Connection=true;", sep = "");
 
 #Get the data from SQL Server Table
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/Predictive Model.sql b/samples/features/r-services/getting-started/rental-prediction/Predictive Model.sql
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/Predictive Model.sql
rename to samples/features/r-services/getting-started/rental-prediction/Predictive Model.sql
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/README.md b/samples/features/r-services/getting-started/rental-prediction/README.md
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/README.md
rename to samples/features/r-services/getting-started/rental-prediction/README.md
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/Setup.sql b/samples/features/r-services/getting-started/rental-prediction/Setup.sql
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/Setup.sql
rename to samples/features/r-services/getting-started/rental-prediction/Setup.sql
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/.gitignore b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/.gitignore
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/.gitignore
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/.gitignore
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/.vscode/launch.json b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/.vscode/launch.json
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/.vscode/launch.json
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/.vscode/launch.json
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/app.js b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/app.js
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/app.js
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/app.js
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/bin/www b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/bin/www
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/bin/www
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/bin/www
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/db.js b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/db.js
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/db.js
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/db.js
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/nodejs-express4-rest-api.njsproj b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/nodejs-express4-rest-api.njsproj
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/nodejs-express4-rest-api.njsproj
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/nodejs-express4-rest-api.njsproj
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/package.json b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/package.json
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/package.json
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/package.json
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/routes/predictions.js b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/routes/predictions.js
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/routes/predictions.js
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/routes/predictions.js
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/client.html b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/client.html
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/client.html
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/client.html
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/favicon.ico b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/favicon.ico
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/favicon.ico
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/favicon.ico
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.eot b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.eot
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.eot
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.svg b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.svg
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.svg
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.ttf b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.ttf
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.ttf
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff2 b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff2
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/Bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff2
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/Bootstrap.css b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/Bootstrap.css
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/Bootstrap.css
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/Bootstrap.css
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/dataTables.bootstrap.css b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/dataTables.bootstrap.css
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/dataTables.bootstrap.css
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/dataTables.bootstrap.css
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/demo.css b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/demo.css
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/css/demo.css
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/css/demo.css
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/images/Sorting icons.psd b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/images/Sorting icons.psd
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/images/Sorting icons.psd
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/images/Sorting icons.psd
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/images/favicon.ico b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/images/favicon.ico
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/images/favicon.ico
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/images/favicon.ico
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/images/sort_asc.png b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/images/sort_asc.png
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/images/sort_asc.png
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/images/sort_asc.png
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/images/sort_asc_disabled.png b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/images/sort_asc_disabled.png
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/images/sort_asc_disabled.png
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/images/sort_asc_disabled.png
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/images/sort_both.png b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/images/sort_both.png
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/images/sort_both.png
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/images/sort_both.png
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/images/sort_desc.png b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/images/sort_desc.png
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/images/sort_desc.png
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/images/sort_desc.png
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/images/sort_desc_disabled.png b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/images/sort_desc_disabled.png
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/images/sort_desc_disabled.png
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/images/sort_desc_disabled.png
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/js/lib/Bootstrap.js b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/js/lib/Bootstrap.js
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/js/lib/Bootstrap.js
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/js/lib/Bootstrap.js
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/js/lib/jquery-ui.js b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/js/lib/jquery-ui.js
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/js/lib/jquery-ui.js
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/js/lib/jquery-ui.js
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/js/lib/jquery.dataTables.Bootstrap.js b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/js/lib/jquery.dataTables.Bootstrap.js
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/js/lib/jquery.dataTables.Bootstrap.js
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/js/lib/jquery.dataTables.Bootstrap.js
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/js/lib/jquery.dataTables.incremental_pagination.js b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/js/lib/jquery.dataTables.incremental_pagination.js
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/js/lib/jquery.dataTables.incremental_pagination.js
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/js/lib/jquery.dataTables.incremental_pagination.js
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/js/lib/jquery.dataTables.js b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/js/lib/jquery.dataTables.js
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/js/lib/jquery.dataTables.js
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/js/lib/jquery.dataTables.js
diff --git a/samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/js/lib/jquery.js b/samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/js/lib/jquery.js
similarity index 100%
rename from samples/features/r-services/Getting-Started/Predictive-Modeling/nodejs-get predictions app/wwwroot/media/js/lib/jquery.js
rename to samples/features/r-services/getting-started/rental-prediction/nodejs-get predictions app/wwwroot/media/js/lib/jquery.js