diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/Application/Stored Procedures/Configuration_DisableInMemory.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/Application/Stored Procedures/Configuration_DisableInMemory.sql
index 52239f22..bb678dcf 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/Application/Stored Procedures/Configuration_DisableInMemory.sql	
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/Application/Stored Procedures/Configuration_DisableInMemory.sql	
@@ -42,8 +42,7 @@ BEGIN
 
             SET @SQL = N'
 ALTER TABLE Warehouse.ColdRoomTemperatures SET (SYSTEM_VERSIONING = OFF);
-ALTER TABLE Warehouse.ColdRoomTemperatures DROP PERIOD FOR SYSTEM_TIME;
-ALTER TABLE Warehouse.ColdRoomTemperatures DROP CONSTRAINT PK_Warehouse_ColdRoomTemperatures;';
+ALTER TABLE Warehouse.ColdRoomTemperatures DROP PERIOD FOR SYSTEM_TIME;';
             EXECUTE (@SQL);
 
             SET @SQL = N'
@@ -471,7 +470,7 @@ SET MEMORY_OPTIMIZED_ELEVATE_TO_SNAPSHOT = OFF;';
 
         END TRY
         BEGIN CATCH
-            PRINT N'Unable to remove in-memory tables';
+            PRINT N'Unable to remove memory-optimized tables';
             THROW;
         END CATCH;
 END;
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/Application/Stored Procedures/Configuration_EnableInMemory.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/Application/Stored Procedures/Configuration_EnableInMemory.sql
index 1c4d5ed2..79bcd4e8 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/Application/Stored Procedures/Configuration_EnableInMemory.sql	
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/Application/Stored Procedures/Configuration_EnableInMemory.sql	
@@ -16,20 +16,20 @@ BEGIN
 			IF CAST(SERVERPROPERTY(N'EngineEdition') AS int) <> 5   -- Not an Azure SQL DB
 			BEGIN
 				DECLARE @SQLDataFolder nvarchar(max) = CAST(SERVERPROPERTY('InstanceDefaultDataPath') AS nvarchar(max));
-				DECLARE @MemoryOptimizedFilegroupFolder nvarchar(max) = @SQLDataFolder + N'WideWorldImporters_InMemory_Data_1';
+				DECLARE @MemoryOptimizedFilegroupFolder nvarchar(max) = @SQLDataFolder + N'WideWorldImporters_MemoryOptimized_Data_1';
 
-				IF NOT EXISTS (SELECT 1 FROM sys.filegroups WHERE name = N'WWI_InMemory_Data')
+				IF NOT EXISTS (SELECT 1 FROM sys.filegroups WHERE type=N'FX')
 				BEGIN
 				    SET @SQL = N'
 ALTER DATABASE CURRENT
-ADD FILEGROUP WWI_InMemory_Data CONTAINS MEMORY_OPTIMIZED_DATA;';
+ADD FILEGROUP WWI_MemoryOptimized_Data CONTAINS MEMORY_OPTIMIZED_DATA;';
 					EXECUTE (@SQL);
 
 					SET @SQL = N'
 ALTER DATABASE CURRENT
-ADD FILE (name = N''WWI_InMemory_Data_1'', filename = '''
+ADD FILE (name = N''WWI_MemoryOptimized_Data_1'', filename = '''
 		                 + @MemoryOptimizedFilegroupFolder + N''')
-TO FILEGROUP WWI_InMemory_Data;';
+TO FILEGROUP WWI_MemoryOptimized_Data;';
 					EXECUTE (@SQL);
 
 				END;
@@ -486,7 +486,7 @@ END;';
 
         END TRY
         BEGIN CATCH
-            PRINT N'Unable to apply in-memory tables';
+            PRINT N'Unable to apply memory-optimized tables';
             THROW;
         END CATCH;
     END; -- of in-memory is allowed
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/Application/Stored Procedures/Configuration_PrepareForDowngradeToStandard.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/Application/Stored Procedures/Configuration_PrepareForDowngradeToStandard.sql
index 767dce4a..f2fb67e0 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/Application/Stored Procedures/Configuration_PrepareForDowngradeToStandard.sql	
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/Application/Stored Procedures/Configuration_PrepareForDowngradeToStandard.sql	
@@ -1,4 +1,5 @@
-CREATE PROCEDURE [Application].[Configuration_PrepareForDowngradeToStandard]
+-- remove features not supported in Azure SQL Database Standard tier
+CREATE PROCEDURE [Application].[Configuration_PrepareForDowngradeToStandard]
 AS
 
   EXEC [Application].[Configuration_RemoveColumnstoreIndexing]