diff --git a/samples/databases/wide-world-importers/oltp-database-scripts/1-wwi-metadata-population.sql b/samples/databases/wide-world-importers/wwi-database-scripts/1-wwi-metadata-population.sql
similarity index 100%
rename from samples/databases/wide-world-importers/oltp-database-scripts/1-wwi-metadata-population.sql
rename to samples/databases/wide-world-importers/wwi-database-scripts/1-wwi-metadata-population.sql
diff --git a/samples/databases/wide-world-importers/oltp-database-scripts/2-wwi-construct-database-from-metadata-tables.sql b/samples/databases/wide-world-importers/wwi-database-scripts/2-wwi-construct-database-from-metadata-tables.sql
similarity index 100%
rename from samples/databases/wide-world-importers/oltp-database-scripts/2-wwi-construct-database-from-metadata-tables.sql
rename to samples/databases/wide-world-importers/wwi-database-scripts/2-wwi-construct-database-from-metadata-tables.sql
diff --git a/samples/databases/wide-world-importers/oltp-database-scripts/3-wwi-recreate.sql b/samples/databases/wide-world-importers/wwi-database-scripts/3-wwi-recreate.sql
similarity index 100%
rename from samples/databases/wide-world-importers/oltp-database-scripts/3-wwi-recreate.sql
rename to samples/databases/wide-world-importers/wwi-database-scripts/3-wwi-recreate.sql
diff --git a/samples/databases/wide-world-importers/oltp-database-scripts/4-wwi-configure-required-database-objects.sql b/samples/databases/wide-world-importers/wwi-database-scripts/4-wwi-configure-required-database-objects.sql
similarity index 100%
rename from samples/databases/wide-world-importers/oltp-database-scripts/4-wwi-configure-required-database-objects.sql
rename to samples/databases/wide-world-importers/wwi-database-scripts/4-wwi-configure-required-database-objects.sql
diff --git a/samples/databases/wide-world-importers/oltp-database-scripts/5-wwi-load-seed-data.sql b/samples/databases/wide-world-importers/wwi-database-scripts/5-wwi-load-seed-data.sql
similarity index 100%
rename from samples/databases/wide-world-importers/oltp-database-scripts/5-wwi-load-seed-data.sql
rename to samples/databases/wide-world-importers/wwi-database-scripts/5-wwi-load-seed-data.sql
diff --git a/samples/databases/wide-world-importers/oltp-database-scripts/6-wwi-data-simulation.sql b/samples/databases/wide-world-importers/wwi-database-scripts/6-wwi-data-simulation.sql
similarity index 100%
rename from samples/databases/wide-world-importers/oltp-database-scripts/6-wwi-data-simulation.sql
rename to samples/databases/wide-world-importers/wwi-database-scripts/6-wwi-data-simulation.sql
diff --git a/samples/databases/wide-world-importers/oltp-database-scripts/7-wwi-enable-full-features.sql b/samples/databases/wide-world-importers/wwi-database-scripts/7-wwi-enable-full-features.sql
similarity index 100%
rename from samples/databases/wide-world-importers/oltp-database-scripts/7-wwi-enable-full-features.sql
rename to samples/databases/wide-world-importers/wwi-database-scripts/7-wwi-enable-full-features.sql
diff --git a/samples/databases/wide-world-importers/oltp-database-scripts/8-wwi-backup.sql b/samples/databases/wide-world-importers/wwi-database-scripts/8-wwi-backup.sql
similarity index 100%
rename from samples/databases/wide-world-importers/oltp-database-scripts/8-wwi-backup.sql
rename to samples/databases/wide-world-importers/wwi-database-scripts/8-wwi-backup.sql
diff --git a/samples/databases/wide-world-importers/oltp-database-scripts/9-wwi-restore.sql b/samples/databases/wide-world-importers/wwi-database-scripts/9-wwi-restore.sql
similarity index 100%
rename from samples/databases/wide-world-importers/oltp-database-scripts/9-wwi-restore.sql
rename to samples/databases/wide-world-importers/wwi-database-scripts/9-wwi-restore.sql
diff --git a/samples/databases/wide-world-importers/oltp-database-scripts/README.md b/samples/databases/wide-world-importers/wwi-database-scripts/README.md
similarity index 100%
rename from samples/databases/wide-world-importers/oltp-database-scripts/README.md
rename to samples/databases/wide-world-importers/wwi-database-scripts/README.md
diff --git a/samples/databases/wide-world-importers/dw-database-scripts/1-wwi-dw-metadata-population.sql b/samples/databases/wide-world-importers/wwi-dw-database-scripts/1-wwi-dw-metadata-population.sql
similarity index 100%
rename from samples/databases/wide-world-importers/dw-database-scripts/1-wwi-dw-metadata-population.sql
rename to samples/databases/wide-world-importers/wwi-dw-database-scripts/1-wwi-dw-metadata-population.sql
diff --git a/samples/databases/wide-world-importers/dw-database-scripts/2-wwi-dw-construct-database-from-metadata-tables.sql b/samples/databases/wide-world-importers/wwi-dw-database-scripts/2-wwi-dw-construct-database-from-metadata-tables.sql
similarity index 100%
rename from samples/databases/wide-world-importers/dw-database-scripts/2-wwi-dw-construct-database-from-metadata-tables.sql
rename to samples/databases/wide-world-importers/wwi-dw-database-scripts/2-wwi-dw-construct-database-from-metadata-tables.sql
diff --git a/samples/databases/wide-world-importers/dw-database-scripts/3-wwi-dw-recreate.sql b/samples/databases/wide-world-importers/wwi-dw-database-scripts/3-wwi-dw-recreate.sql
similarity index 100%
rename from samples/databases/wide-world-importers/dw-database-scripts/3-wwi-dw-recreate.sql
rename to samples/databases/wide-world-importers/wwi-dw-database-scripts/3-wwi-dw-recreate.sql
diff --git a/samples/databases/wide-world-importers/dw-database-scripts/4-wwi-dw-configured-required-database-objects.sql b/samples/databases/wide-world-importers/wwi-dw-database-scripts/4-wwi-dw-configured-required-database-objects.sql
similarity index 100%
rename from samples/databases/wide-world-importers/dw-database-scripts/4-wwi-dw-configured-required-database-objects.sql
rename to samples/databases/wide-world-importers/wwi-dw-database-scripts/4-wwi-dw-configured-required-database-objects.sql
diff --git a/samples/databases/wide-world-importers/dw-database-scripts/5-wwi-dw-load-seed-data.sql b/samples/databases/wide-world-importers/wwi-dw-database-scripts/5-wwi-dw-load-seed-data.sql
similarity index 100%
rename from samples/databases/wide-world-importers/dw-database-scripts/5-wwi-dw-load-seed-data.sql
rename to samples/databases/wide-world-importers/wwi-dw-database-scripts/5-wwi-dw-load-seed-data.sql
diff --git a/samples/databases/wide-world-importers/dw-database-scripts/6-wwi-dw-enable-full-features.sql b/samples/databases/wide-world-importers/wwi-dw-database-scripts/6-wwi-dw-enable-full-features.sql
similarity index 100%
rename from samples/databases/wide-world-importers/dw-database-scripts/6-wwi-dw-enable-full-features.sql
rename to samples/databases/wide-world-importers/wwi-dw-database-scripts/6-wwi-dw-enable-full-features.sql
diff --git a/samples/databases/wide-world-importers/dw-database-scripts/8-wwi-dw-backup.sql b/samples/databases/wide-world-importers/wwi-dw-database-scripts/8-wwi-dw-backup.sql
similarity index 100%
rename from samples/databases/wide-world-importers/dw-database-scripts/8-wwi-dw-backup.sql
rename to samples/databases/wide-world-importers/wwi-dw-database-scripts/8-wwi-dw-backup.sql
diff --git a/samples/databases/wide-world-importers/dw-database-scripts/9-wwi-dw-restore.sql b/samples/databases/wide-world-importers/wwi-dw-database-scripts/9-wwi-dw-restore.sql
similarity index 100%
rename from samples/databases/wide-world-importers/dw-database-scripts/9-wwi-dw-restore.sql
rename to samples/databases/wide-world-importers/wwi-dw-database-scripts/9-wwi-dw-restore.sql
diff --git a/samples/databases/wide-world-importers/dw-database-scripts/README.md b/samples/databases/wide-world-importers/wwi-dw-database-scripts/README.md
similarity index 100%
rename from samples/databases/wide-world-importers/dw-database-scripts/README.md
rename to samples/databases/wide-world-importers/wwi-dw-database-scripts/README.md