diff --git a/samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - APPROX_COUNT_DISTINCT.sql b/samples/features/intelligent-query-processing/Intelligent QP Demo - APPROX_COUNT_DISTINCT.sql
similarity index 100%
rename from samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - APPROX_COUNT_DISTINCT.sql
rename to samples/features/intelligent-query-processing/Intelligent QP Demo - APPROX_COUNT_DISTINCT.sql
diff --git a/samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - Batch Mode Adaptive Join.sql b/samples/features/intelligent-query-processing/Intelligent QP Demo - Batch Mode Adaptive Join.sql
similarity index 100%
rename from samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - Batch Mode Adaptive Join.sql
rename to samples/features/intelligent-query-processing/Intelligent QP Demo - Batch Mode Adaptive Join.sql
diff --git a/samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - Batch Mode MGF.sql b/samples/features/intelligent-query-processing/Intelligent QP Demo - Batch Mode MGF.sql
similarity index 100%
rename from samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - Batch Mode MGF.sql
rename to samples/features/intelligent-query-processing/Intelligent QP Demo - Batch Mode MGF.sql
diff --git a/samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - Batch Mode on Rowstore.sql b/samples/features/intelligent-query-processing/Intelligent QP Demo - Batch Mode on Rowstore.sql
similarity index 100%
rename from samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - Batch Mode on Rowstore.sql
rename to samples/features/intelligent-query-processing/Intelligent QP Demo - Batch Mode on Rowstore.sql
diff --git a/samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - Interleaved Execution.sql b/samples/features/intelligent-query-processing/Intelligent QP Demo - Interleaved Execution.sql
similarity index 100%
rename from samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - Interleaved Execution.sql
rename to samples/features/intelligent-query-processing/Intelligent QP Demo - Interleaved Execution.sql
diff --git a/samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - Row Mode MGF.sql b/samples/features/intelligent-query-processing/Intelligent QP Demo - Row Mode MGF.sql
similarity index 100%
rename from samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - Row Mode MGF.sql
rename to samples/features/intelligent-query-processing/Intelligent QP Demo - Row Mode MGF.sql
diff --git a/samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - Scalar UDF Inlining.sql b/samples/features/intelligent-query-processing/Intelligent QP Demo - Scalar UDF Inlining.sql
similarity index 100%
rename from samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - Scalar UDF Inlining.sql
rename to samples/features/intelligent-query-processing/Intelligent QP Demo - Scalar UDF Inlining.sql
diff --git a/samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - TVDC.sql b/samples/features/intelligent-query-processing/Intelligent QP Demo - TVDC.sql
similarity index 100%
rename from samples/features/intelligent-query-processing/Intelligent QP Demos WideWorldImportersDW Public Preview - TVDC.sql
rename to samples/features/intelligent-query-processing/Intelligent QP Demo - TVDC.sql
diff --git a/samples/features/intelligent-query-processing/Intelligent QP Demos Enlarging WideWorldImportersDW.sql b/samples/features/intelligent-query-processing/Intelligent QP Demo Setup - Enlarging WideWorldImportersDW.sql
similarity index 100%
rename from samples/features/intelligent-query-processing/Intelligent QP Demos Enlarging WideWorldImportersDW.sql
rename to samples/features/intelligent-query-processing/Intelligent QP Demo Setup - Enlarging WideWorldImportersDW.sql
diff --git a/samples/features/intelligent-query-processing/readme.md b/samples/features/intelligent-query-processing/readme.md
index 1f79e71a..549774e3 100644
--- a/samples/features/intelligent-query-processing/readme.md
+++ b/samples/features/intelligent-query-processing/readme.md
@@ -4,17 +4,17 @@ Here are the instructions to prepare for demonstrating Intelligent QP's latest r
 
 1) Download WideWorldImportersDW-Full.bak from https://aka.ms/wwidwbak 
 
-2) Enlarge the database using the following script: https://aka.ms/wwidwenlarge 
+2) Enlarge the database using the [following script](Intelligent%20QP%20Demo%20Setup%20-%20Enlarging%20WideWorldImportersDW.sql) (https://aka.ms/wwidwenlarge) 
 
 Demos (with more on the way!):
 
-- [Batch Mode Adaptive Join](Intelligent%20QP%20Demos%20WideWorldImportersDW%20Public%20Preview%20-%20Batch%20Mode%20Adaptive%20Join.sql)
-- [Interleaved Execution](Intelligent%20QP%20Demos%20WideWorldImportersDW%20Public%20Preview%20-%20Interleaved%20Execution.sql)
-- [Batch mode memory grant feedback](Intelligent%20QP%20Demos%20WideWorldImportersDW%20Public%20Preview%20-%20Batch%20Mode%20MGF.sql)
-- [Row mode memory grant feedback](Intelligent%20QP%20Demos%20WideWorldImportersDW%20Public%20Preview%20-%20Row%20Mode%20MGF.sql) 
-- [Batch mode on rowstore](Intelligent%20QP%20Demos%20WideWorldImportersDW%20Public%20Preview%20-%20Batch%20Mode%20on%20Rowstore.sql) 
-- [APPROX_COUNT_DISTINCT](Intelligent%20QP%20Demos%20WideWorldImportersDW%20Public%20Preview%20-%20APPROX_COUNT_DISTINCT.sql) 
-- [Table variable deferred compilation](Intelligent%20QP%20Demos%20WideWorldImportersDW%20Public%20Preview%20-%20TVDC.sql) 
-- [Scalar UDF Inlining](Intelligent%20QP%20Demos%20WideWorldImportersDW%20Public%20Preview%20-%20Scalar%20UDF%20Inlining.sql)
+- [Batch Mode Adaptive Join](Intelligent%20QP%20Demo%20-%20Batch%20Mode%20Adaptive%20Join.sql)
+- [Interleaved Execution](Intelligent%20QP%20Demo%20-%20Interleaved%20Execution.sql)
+- [Batch mode memory grant feedback](Intelligent%20QP%20Demo%20-%20Batch%20Mode%20MGF.sql)
+- [Row mode memory grant feedback](Intelligent%20QP%20Demo%20-%20Row%20Mode%20MGF.sql) 
+- [Batch mode on rowstore](Intelligent%20QP%20Demo%20-%20Batch%20Mode%20on%20Rowstore.sql) 
+- [APPROX_COUNT_DISTINCT](Intelligent%20QP%20Demo%20-%20APPROX_COUNT_DISTINCT.sql) 
+- [Table variable deferred compilation](Intelligent%20QP%20Demo%20-%20TVDC.sql) 
+- [Scalar UDF Inlining](Intelligent%20QP%20Demo%20-%20Scalar%20UDF%20Inlining.sql)
 
 Email IntelligentQP@microsoft.com if questions in the meantime.
\ No newline at end of file