diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Functions/GetCityLocation.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Functions/GetCityLocation.sql
index 1b3b6458..220a407f 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Functions/GetCityLocation.sql
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Functions/GetCityLocation.sql
@@ -17,7 +17,7 @@ Usage:
 
   SELECT TOP 1 @Loc = [Location] 
     FROM [Application].Cities 
-   WHERE CityID = @CityId
+   WHERE CityID = @CityID
 
   RETURN @Loc
   
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Functions/GetSupplierCategoryID.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Functions/GetSupplierCategoryID.sql
index 1607996e..658db969 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Functions/GetSupplierCategoryID.sql
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Functions/GetSupplierCategoryID.sql
@@ -17,7 +17,7 @@ Usage:
 
   DECLARE @SupCatID INT
 
-  SELECT TOP 1 @SupCatId = SupplierCategoryID 
+  SELECT TOP 1 @SupCatID = SupplierCategoryID 
     FROM Purchasing.SupplierCategories 
    WHERE SupplierCategoryName = @SupplierCategoryName
      AND ValidTo = '99991231 23:59:59.9999999'
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/AddCustomers.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/AddCustomers.sql
index a4bdbe13..bdf0bc36 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/AddCustomers.sql	
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/AddCustomers.sql	
@@ -117,7 +117,7 @@ BEGIN
         @randomSecondaryAddress = @PostalAddressLine2 OUTPUT
       
       EXEC [DataLoadSimulation].[GetBogativePostalCode] 
-          @CityID = @CityId
+          @CityID = @CityID
         , @PostalCode = @DeliveryPostalCode OUTPUT
       SET @PostalPostalCode = @DeliveryPostalCode;
 
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/DeactivateTemporalTablesBeforeDataLoad.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/DeactivateTemporalTablesBeforeDataLoad.sql
index b51d6cd5..69f6a7c3 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/DeactivateTemporalTablesBeforeDataLoad.sql	
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/DeactivateTemporalTablesBeforeDataLoad.sql	
@@ -95,7 +95,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -132,7 +132,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -169,7 +169,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -206,7 +206,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -243,7 +243,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -280,7 +280,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -317,7 +317,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -354,7 +354,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -391,7 +391,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -428,7 +428,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -465,7 +465,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -502,7 +502,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -539,7 +539,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -576,7 +576,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -613,7 +613,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -650,7 +650,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
@@ -687,7 +687,7 @@ AS BEGIN
               + @Indent + @Indent + N'THROW 51000, ''' + QUOTENAME(@TemporalFromColumnName)
                                   + N' must be updated when simulating data loads'', 1;' + @CrLf
               + @Indent + @Indent + N'ROLLBACK TRAN;' + @CrLf
-              + @Indent + N'END;' + @Crlf + @CrLf
+              + @Indent + N'END;' + @CrLf + @CrLf
               + @Indent + N'INSERT ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + @CrLf
               + @Indent + @Indent + N'(' + @NormalColumnList + CASE WHEN COALESCE(@LastEditedByColumnName, N'') <> N'' THEN QUOTENAME(@LastEditedByColumnName) + N', ' ELSE N'' END
                                   + QUOTENAME(@TemporalFromColumnName) + N',' + QUOTENAME(@TemporalToColumnName) + N')' + @CrLf
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/GetBuyingGroupDomain.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/GetBuyingGroupDomain.sql
index d78c5b55..87ea782c 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/GetBuyingGroupDomain.sql	
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/GetBuyingGroupDomain.sql	
@@ -72,7 +72,7 @@ Usage:
   SET @WebDomain = N'N/A'
   SET @EmailDomain = N'N/A'
   SELECT @WebDomain = WebDomain, @EmailDomain = EmailDomain
-    FROM @URLS
+    FROM @urls
    WHERE BuyingGroupName = @BuyingGroup
 
 END
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/GetRandomEmployeePerson.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/GetRandomEmployeePerson.sql
index 3a085f48..e1cc2ac9 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/GetRandomEmployeePerson.sql	
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/GetRandomEmployeePerson.sql	
@@ -13,7 +13,7 @@ Notes:
 Usage:
   DECLARE @myEmployeePersonID INT
   EXEC [DataLoadSimulation].[GetRandomEmployeePerson]
-      @EmployeePersonId = @myEmployeePersonID OUTPUT
+      @EmployeePersonID = @myEmployeePersonID OUTPUT
   SELECT @myEmployeePersonID 
 
 */
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/PerformStocktake.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/PerformStocktake.sql
index 2e72da29..e26dcdfe 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/PerformStocktake.sql	
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/PerformStocktake.sql	
@@ -17,7 +17,7 @@ BEGIN
 
     DECLARE @StaffMemberPersonID INT
     EXEC [DataLoadSimulation].[GetRandomEmployeePerson]
-      @EmployeePersonId = @StaffMemberPersonID OUTPUT
+      @EmployeePersonID = @StaffMemberPersonID OUTPUT
 
 
     DECLARE @Counter int = 0;
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/PickStockForCustomerOrders.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/PickStockForCustomerOrders.sql
index 9360404d..beea576a 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/PickStockForCustomerOrders.sql	
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/PickStockForCustomerOrders.sql	
@@ -65,7 +65,7 @@ BEGIN
     --                                 ORDER BY NEWID());
     DECLARE @PickingPersonID INT
     EXEC [DataLoadSimulation].[GetRandomEmployeePerson]
-      @EmployeePersonId = @PickingPersonID OUTPUT
+      @EmployeePersonID = @PickingPersonID OUTPUT
 
     OPEN OrderLineList;
     FETCH NEXT FROM OrderLineList INTO @OrderID, @OrderLineID, @StockItemID, @Quantity;
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/PlaceSupplierOrders.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/PlaceSupplierOrders.sql
index e1bd8f06..69c1a07c 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/PlaceSupplierOrders.sql	
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/PlaceSupplierOrders.sql	
@@ -19,9 +19,9 @@ BEGIN
     DECLARE @SupplierPersonID INT
 
     EXEC [DataLoadSimulation].[GetRandomEmployeePerson]
-      @EmployeePersonId = @ContactPersonID OUTPUT
+      @EmployeePersonID = @ContactPersonID OUTPUT
     EXEC [DataLoadSimulation].[GetRandomEmployeePerson]
-      @EmployeePersonId = @SupplierPersonID OUTPUT
+      @EmployeePersonID = @SupplierPersonID OUTPUT
       
     DECLARE @Orders TABLE
     (
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/ProcessCustomerPayments.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/ProcessCustomerPayments.sql
index 611c251a..ea947aa9 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/ProcessCustomerPayments.sql	
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/ProcessCustomerPayments.sql	
@@ -22,7 +22,7 @@ BEGIN
     --                                     ORDER BY NEWID());
     DECLARE @StaffMemberPersonID INT 
     EXEC [DataLoadSimulation].[GetRandomEmployeePerson]
-      @EmployeePersonId = @StaffMemberPersonID OUTPUT
+      @EmployeePersonID = @StaffMemberPersonID OUTPUT
 
 
     DECLARE @TransactionsToReceive TABLE
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/RecordInvoiceDeliveries.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/RecordInvoiceDeliveries.sql
index e41cc787..0ed1f045 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/RecordInvoiceDeliveries.sql	
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/DataLoadSimulation/Stored Procedures/RecordInvoiceDeliveries.sql	
@@ -22,7 +22,7 @@ BEGIN
     --                                       ORDER BY NEWID());
     DECLARE @DeliveryDriverPersonID INT
     EXEC [DataLoadSimulation].[GetRandomEmployeePerson]
-      @EmployeePersonId = @DeliveryDriverPersonID OUTPUT
+      @EmployeePersonID = @DeliveryDriverPersonID OUTPUT
 
     DECLARE @ReturnedDeliveryData nvarchar(max);
     DECLARE @InvoiceID int;
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/PostDeploymentScripts/pds110-ins-app-countries.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/PostDeploymentScripts/pds110-ins-app-countries.sql
index c9f2c0c2..f32f25a6 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/PostDeploymentScripts/pds110-ins-app-countries.sql
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/PostDeploymentScripts/pds110-ins-app-countries.sql
@@ -5,7 +5,7 @@ DECLARE @CurrentDateTime datetime2(7) = '20130101'
 DECLARE @EndOfTime datetime2(7) =  '99991231 23:59:59.9999999'
 
 INSERT [Application].[Countries] 
-  ([CountryID], [CountryName], [FormalName], [IsoAlpha3Code], [IsoNumericCode], [CountryType], [LatestRecordedPopulation], [Continent], [Region], [SubRegion], [Border], [LastEditedBy], [ValidFrom], [ValidTo]) 
+  ([CountryID], [CountryName], [FormalName], [IsoAlpha3Code], [IsoNumericCode], [CountryType], [LatestRecordedPopulation], [Continent], [Region], [Subregion], [Border], [LastEditedBy], [ValidFrom], [ValidTo]) 
 VALUES 
   (1, N'Afghanistan', N'Islamic State of Afghanistan', N'AFG', 4, N'UN Member State', CAST(28400000.000000 AS Numeric(16, 6)), N'Asia', N'Asia', N'Southern Asia', 0xE610000001049A01000066666666A69D4240343333330BB9524099999999F99E42406866666606B852409999999999A442406866666626B5524033333333B3AD42409A999999C1AE5240666666667EB242403433333333AA524099999999F1B04240CECCCCCC8CA1524033333333A3B242409A999999799C52409999999999B542406866666656965240CCCCCCCC2CB54240686666669E905240CCCCCCCCACAF424068666666068D5240333333332BAA42409A999999B18A52409999999979A842409A999999F9845240666666663EA442409A999999B97C524033333333AB9D42409A999999F96F524033333333A39E424034333333D3695240333333337BA142409A999999296852406666666646A542406866666686695240333333332BAA424000000000E86D52409999999919B0424068666666F66E52409999999999B54240686666661E6E52409999999919B74240686666660E6A524066666666F6B74240CECCCCCC7C6852400000000018B9424034333333B36652400000000060BC424068666666CE5E5240333333332BBB42409A999999815852409999999949B4424034333333834D5240666666663EA242400000000050395240333333331B964240343333337330524000000000B883424034333333132A524000000000D07D424068666666F6165240CCCCCCCC4473424034333333D3095240333333331B6242409A99999949FC514066666666DE584240CECCCCCC54F35140666666668E57424068666666F6EE5140CCCCCCCC345942409A99999999EA514000000000D05D4240CECCCCCC3CE65140CCCCCCCC2C6C42409A999999F9E1514066666666EE8142403433333333DE51403333333353904240CECCCCCCB4DB514033333333CBA24240343333331BDD514000000000D0B7424034333333B3DE5140CCCCCCCC2CCD42403433333353E0514000000000D8E54240CECCCCCCF4E2514000000000A0EE4240CECCCCCC24E55140666666667EF442403433333343E551409999999971F742403433333353E351400000000048F742400000000038DF51409999999901F4424000000000F0D851400000000070F342409A99999979D45140666666668EF5424034333333D3D1514033333333030143409A99999919D2514033333333CB154340343333334BD55140333333334B2743400000000060D05140CCCCCCCC7C3543406866666656C35140333333336B3A43400000000040B8514066666666163643409A99999919AF514066666666CE2A43409A99999969A7514033333333931843400000000030A1514000000000A8094340CECCCCCCBC9A5140666666660EFE4240CECCCCCC0C9451409999999979F8424000000000488F51403333333353F64240CECCCCCCBC8D51409999999969F1424034333333C38C514000000000F8E142409A999999519051403333333303D542400000000018905140666666668ECA424034333333138C51409999999991C5424034333333AB875140333333330BC64240CECCCCCCDC8251400000000078C842409A999999097F514066666666D6CC424034333333337C51406666666606CE42409A999999897451409999999909CC4240CECCCCCC0C68514033333333CBC64240686666667E5F5140CCCCCCCC4CBE424034333333E35A5140CCCCCCCC1CB34240CECCCCCC8C595140333333333BA5424000000000805B514000000000989A424068666666865A5140CCCCCCCC34934240CECCCCCCA456514000000000F88E4240343333337353514000000000E08D424034333333F3505140333333334394424000000000884B5140CCCCCCCC1CA242403433333333435140333333339BA9424000000000783D514066666666BEAA4240343333335B3A514066666666FEA9424000000000A8385140666666668EA8424068666666BE36514033333333C3A642409A999999A935514066666666A6A2424000000000B83451406666666606A14240CECCCCCC0C325140666666664EA242409A999999492E51403333333313A1424034333333D32A514033333333BB9C4240CECCCCCCC4285140333333337B9742409A999999F9225140999999999991424034333333C318514099999999518B4240343333332B13514066666666A68442409A99999939125140CCCCCCCCAC81424034333333B310514099999999C182424034333333930D514033333333937942406866666656045140333333336B7C42400000000050FD504000000000388842400000000068F5504000000000F09142406866666606F15040333333330B9642403433333393F0504033333333939942400000000030F0504066666666169D4240CECCCCCCCCEC5040333333337B9C424000000000E0E6504099999999299E42409A999999F9E250409999999921A24240343333331BE150406666666606A14240CECCCCCC44DC504033333333D39A42406866666676D45040333333331B9E42403433333383CC504033333333DBAA42400000000068C450406666666686AF42409A999999F9B45040333333339BAC4240CECCCCCC6CA150400000000020AC424034333333339E50400000000020AF4240343333336B9650406666666616B5424000000000F08650409999999909C14240CECCCCCCA479504099999999D9C8424068666666F670504099999999C9C74240343333339B6F50403333333373C2424068666666B66B504099999999E1BB42409A999999096950400000000028AF42409A999999E96650406666666626A04240CECCCCCC8463504066666666969F4240686666666E535040CCCCCCCC749E4240CECCCCCCBC45504066666666C698424068666666E63C504000000000E8904240686666663E34504066666666968742403433333313325040666666667E7B42403433333333305040666666660660424000000000282B504033333333FB464240000000009026504033333333BB3642406866666636245040333333339B2B4240CECCCCCCB420504000000000F01C42409A999999E91650400000000010134240CECCCCCCCC0B5040CCCCCCCC6C0E424068666666E605504000000000A80842409A99999949035040666666663603424068666666B6025040CCCCCCCC8C014240686666669E00504066666666860242403433333313F84F40CCCCCCCC940142406866666666EE4F4099999999E1FB41409C99999929D94F4099999999E1F44140D0CCCCCC2CC24F4000000000E0ED4140D0CCCCCC9CA64F4099999999E1ED414068666666E6964F400000000050EC414034333333A3904F4033333333CBE8414068666666E68D4F40CCCCCCCC24E2414034333333A3904F400000000038DD4140D0CCCCCC4C934F40CCCCCCCCCCD641409C999999B9954F40333333339BD1414068666666468F4F4066666666B6C8414068666666C68A4F400000000010B941400000000040874F400000000060B441409C999999797D4F4099999999C1AC414034333333D36D4F4033333333BBA2414000000000805C4F4066666666AEA041403433333313584F4000000000D89D414068666666264E4F40CCCCCCCCB49E4140D0CCCCCC3C444F40CCCCCCCC2CA0414000000000403B4F4099999999999D4140D0CCCCCC7C314F40CCCCCCCCDC9541406866666666274F40CCCCCCCC3498414068666666B6224F400000000008A04140D0CCCCCC5C204F40CCCCCCCC1CA5414068666666461B4F409999999999B041409C999999790B4F4033333333CBB8414000000000F0FD4E40CCCCCCCC54B941403433333313F84E40333333333BB7414068666666A6EB4E4000000000B0B541400000000020DC4E406666666656B74140D0CCCCCC7CCF4E40333333339BBA41409C99999979C54E40CCCCCCCCDCC54140D0CCCCCCFCB54E4033333333EBCB41409C99999959B04E403333333393D041400000000020AC4E40666666664ECF41409C99999989A14E4066666666D6C641403433333313A44E4033333333C3C1414068666666A6A34E4066666666AEBC4140D0CCCCCC6C9F4E40CCCCCCCC54B6414034333333E39C4E409999999949AE41400000000080994E4000000000F0A741409C99999939984E4099999999F9A4414000000000E0914E4033333333DBA24140D0CCCCCCCC8C4E4000000000D09A414068666666A68D4E4099999999099441400000000030904E4000000000008C41406866666626934E40666666667E86414034333333C38F4E40CCCCCCCC2480414068666666A68D4E4033333333FB754140D0CCCCCCFC884E40CCCCCCCC846D414000000000408A4E409999999951664140D0CCCCCC2C854E4000000000F85F414034333333D37E4E4033333333E35A41409C999999997A4E4099999999B153414000000000C0794E4066666666265141406866666616754E4099999999394B414034333333336C4E4066666666FE46414034333333B3664E4099999999B945414068666666A65E4E40666666665642414068666666F65C4E4033333333F33E41409C999999395E4E40CCCCCCCCD43C4140D0CCCCCC9C614E40999999998135414068666666E6664E4033333333E32841409C999999D9714E4099999999512741403433333343524E40CCCCCCCC1C1C4140D0CCCCCCFC484E4099999999210C4140D0CCCCCC2C3E4E4066666666C6EB40406866666676434E400000000020DB404034333333333E4E4000000000C8D140403433333363414E40666666664ECB40403433333373494E4033333333BBC740409C999999C9534E403333333383C740409C99999939674E40CCCCCCCCFCC440406866666616744E4033333333ABC040400000000060754E406666666666BA4040D0CCCCCCFC6D4E409999999991AE40409C99999929624E409999999969A940409C999999E95B4E40CCCCCCCCA491404000000000C0474E406666666686874040D0CCCCCCEC474E4000000000587F4040D0CCCCCCCC494E4066666666AE6540400000000080524E40CCCCCCCCCC4C404000000000F05A4E40CCCCCCCCEC1F404068666666266A4E40000000008015404034333333E3694E4032333333B3FC3F40D0CCCCCC1C654E400000000090E03F40D0CCCCCCCC644E406666666606BC3F4034333333F3664E40CCCCCCCC1CA93F403433333353654E4032333333C37E3F40D0CCCCCC0C694E4066666666B67B3F4034333333536D4E40CCCCCCCC7C733F40D0CCCCCC2C8E4E4000000000F06B3F409C99999959AC4E4066666666E6613F400000000080D44E409899999909493F4068666666A6E04E403233333393123F409C99999939E84E40CCCCCCCCCCE93E409C999999C9E74E4098999999F9D43E400000000060E44E400000000070993E40D0CCCCCC9CC74E40CCCCCCCC1C5D3E403433333373AA4E4000000000E0203E4034333333538D4E4032333333D3DB3D4034333333F36B4E4098999999D9BF3D409C999999B99C4E409899999969AA3D4000000000C0C24E4098999999C9873D400000000020004F4066666666E66C3D40D0CCCCCCCC2F4F409899999989683D4000000000003D4F40CCCCCCCC7C7F3D4068666666A6C84F4098999999196E3D409C99999949FC4F406666666656643D409A99999951065040CCCCCCCC0C6A3D40CECCCCCC8C07504098999999D9753D40CECCCCCC040B504066666666C6813D40000000000811504098999999598B3D4034333333331950403233333383903D409A999999592150400000000030913D4068666666062D5040CCCCCCCC6C903D4034333333F334504032333333838D3D4000000000D03A504098999999398F3D40CECCCCCC1C46504000000000E0933D40CECCCCCC8C4B5040CCCCCCCCCCA63D40CECCCCCC245E50409899999989B33D4034333333A36A50406666666666C73D40343333338B7D504098999999E9D53D40CECCCCCC548B504000000000A0DD3D40CECCCCCCCC8E50406666666686EB3D40CECCCCCC5C92504032333333F3F73D40686666660E94504032333333230B3E409A999999D18F504000000000101C3E4034333333438F50406666666686313E409A999999099250406666666636523E40CECCCCCC8C93504032333333C3803E40343333334393504000000000A09B3E40CECCCCCC5C9250403233333383CD3E4034333333339650406666666686E93E40343333336B995040CCCCCCCCECF63E40CECCCCCCD49F50400000000020FF3E406866666646A45040CCCCCCCC1C053F409A99999921A6504098999999C90B3F4034333333F3A75040CCCCCCCCCC313F4068666666CEAE50400000000080433F403433333313B55040CCCCCCCC3C4E3F400000000028BB5040CCCCCCCCDC4C3F4068666666C6C1504000000000303E3F40343333336BC7504032333333C3373F403433333363D2504000000000103C3F4034333333FBDC50406666666616473F40343333332BE650400000000020503F406866666656EA5040CCCCCCCC0C583F409A99999939EF50406666666616613F409A999999F1EE504032333333F3683F409A99999969E95040CCCCCCCC0C743F40686666663EE6504098999999A9813F409A99999901E55040CCCCCCCCEC893F40CECCCCCC1CE8504066666666568C3F409A99999959EF50400000000090AD3F409A999999190151406666666666C33F40CECCCCCC540851400000000090CD3F40686666664E0A514000000000B0CE3F409A999999B10D51406666666686C43F4000000000781451406666666626C13F40686666665E1C5140CCCCCCCC4CCB3F4034333333532151400000000090CD3F400000000040265140CCCCCCCC7CC23F4068666666162B51403233333343B53F40CECCCCCCAC2D5140CCCCCCCC7CA53F409A99999911325140CCCCCCCC5CA23F40CECCCCCC9C37514098999999D9AA3F40CECCCCCC4C3E5140CCCCCCCC0CBD3F409A99999951455140CCCCCCCC8CD63F4068666666F64B514032333333D3EF3F4000000000E051514066666666EE1F4040343333336B505140666666667E37404034333333734F514099999999E9434040686666668E52514000000000904B40409A9999990157514033333333635740409A999999F159514033333333D3614040CECCCCCCE459514099999999996A404000000000005D514099999999918240409A999999196051406666666636884040686666665664514000000000208C40409A999999096D514066666666668E404034333333E37A5140333333335B99404068666666C685514066666666FEA4404068666666B6905140CCCCCCCC3CAF404000000000309251403333333333BA404000000000108E5140CCCCCCCC74CF40406866666696885140CCCCCCCC24DC404000000000A083514066666666E6F24040686666668E77514066666666EE00414000000000F078514099999999A10641409A999999A97F5140CCCCCCCCECFC4040343333333B9051406666666606FB404000000000D894514000000000A8F94040343333339B9A5140CCCCCCCCE4F9404034333333DBA9514066666666AEFD4040CECCCCCC4CB65140CCCCCCCC5C064140CECCCCCC4CC35140CCCCCCCC640F414000000000D8C55140666666661E1A414034333333B3C5514099999999F92241409A999999E9C5514099999999492F41400000000020C6514000000000303741400000000078C15140666666663E3E414068666666A6BE514033333333E3434140CECCCCCCCCBD514066666666FE464140343333330BC1514000000000C04C41403433333333C45140666666663E5741400000000040C7514000000000C86341403433333373CE514099999999116F414034333333D3D25140666666666E74414034333333EBD65140CCCCCCCCC47B41400000000020DD5140333333338B8641400000000018E1514033333333FB8C41409A999999E9E2514099999999499341409A99999981E65140CCCCCCCC6C97414068666666B6E75140333333331B9B4140CECCCCCCBCE6514066666666BE9F41409A999999F1E4514099999999F9A441409A999999E9E25140CCCCCCCC0CAA41409A999999E9E251409999999969AF4140343333339BE451406666666636B441400000000070E65140CCCCCCCCFCBA41400000000098E5514066666666FEC54140343333339BE45140333333337BCC41400000000038E151400000000078DB414034333333F3DE514000000000B8EA4140CECCCCCC5CDB514099999999A9F041409A99999971D951409999999921F841409A999999F1D5514066666666160042400000000018CE5140333333336305424000000000D8CB514066666666960F424000000000E8CE514099999999E91542409A99999901D45140999999998925424068666666A6DD5140000000005830424000000000F0E2514066666666DE37424068666666B6E7514099999999993642409A999999D9ED514066666666463742403433333373F1514000000000383E424000000000A0F451400000000060444240CECCCCCCECFA5140666666661E514240686666661E06524066666666B659424000000000080A5240333333330B5E4240CECCCCCCFC0F524066666666065F4240CECCCCCCEC145240666666660662424000000000981B524000000000A86642409A9999990122524000000000306A4240CECCCCCCDC27524099999999E16A42409A9999990931524099999999016D42409A999999993F5240CCCCCCCC2C6F42409A9999997947524033333333DB70424000000000505A524033333333A371424068666666D66E524099999999B97142409A99999939715240CCCCCCCC2C6D42409A999999197A5240333333335B694240686666661E80524099999999B1694240CECCCCCC7C825240CCCCCCCCCC72424068666666768C524099999999E97D424068666666969B524066666666D682424068666666A6A25240CCCCCCCCEC8342409A999999B1A15240333333335387424068666666DE9F5240CCCCCCCC94914240343333331398524000000000309442409A999999D197524099999999499E424068666666C6A352403333333323A2424000000000D0AA52406666666636A542409A99999981AE52400000000090A44240343333334BAF5240CCCCCCCCE49F4240CECCCCCC1CB1524066666666CE9C424068666666C6B5524066666666A69D4240343333330BB9524001000000020000000001000000FFFFFFFF0000000003, 1, @CurrentDateTime, @EndOfTime)
 , (3, N'Albania', N'Republic of Albania', N'ALB', 8, N'UN Member State', CAST(3639453.000000 AS Numeric(16, 6)), N'Europe', N'Europe', N'Southern Europe', 0xE6100000010471000000CCCCCCCC0C4645400000000060103440333333336346454038333333B30B344033333333DB4045406866666666F0334000000000403E4540A099999919DC334033333333F33C4540D0CCCCCCCCC93340333333339B3F45406866666626C13340000000003843454000000000E0BC334000000000B04D454000000000A0BD334000000000385145403833333353BA334000000000F05245403833333313B43340CCCCCCCC74504540D0CCCCCC8CA73340000000006048454038333333F398334000000000F83E454068666666668B3340333333332B354540383333331377334033333333C32B4540D0CCCCCC4C66334000000000E81F4540A0999999395433406666666616164540A0999999D9473340CCCCCCCC8C10454038333333B354334000000000D808454068666666865C3340333333331303454068666666265A334066666666B6FF444038333333735C3340CCCCCCCC9CF544403833333373583340666666663EEF444068666666A65733406666666696ED444000000000E0773340CCCCCCCCCCE44440A0999999D993334099999999F9D144400000000060933340CCCCCCCC64CC4440A0999999B98B33406666666606C8444038333333537F3340666666665EB64440D0CCCCCCCC7033406666666616A94440383333331374334099999999419E444068666666E67A334033333333938D444000000000C0743340666666667677444038333333137633406666666636654440686666664662334000000000F8544440686666666656334000000000A04F4440A09999993958334099999999313C4440383333337370334033333333E3334440D0CCCCCC8C753340666666661630444068666666C6703340CCCCCCCC6432444000000000006533409999999951344440D0CCCCCCCC5B3340333333331B344440000000008052334099999999812C444038333333335C33406666666676244440D0CCCCCCEC65334000000000E01A4440D0CCCCCC0C7C334033333333930544403833333313DA334066666666A6EF43400000000000F733400000000088E6434000000000E0FE334066666666CEDA4340383333335300344000000000F8DA434068666666C6053440CCCCCCCC7CD94340D0CCCCCC4C0F344000000000B0D44340D0CCCCCC8C21344066666666A6D3434038333333F3343440CCCCCCCCD4D64340D0CCCCCC8C3F344000000000C0D9434068666666A64534409999999989DE434000000000A04934400000000020E44340A0999999394B344099999999F9E5434000000000604E34400000000058E5434038333333335D3440CCCCCCCCBCE6434068666666E661344000000000C0EB434038333333B36134400000000000F24340000000002058344033333333B3F9434038333333B34F3440666666665EFD434068666666A64F344033333333DBFE434068666666A65634403333333333024440A099999939623440CCCCCCCC540644403833333373683440CCCCCCCC6408444000000000C0743440CCCCCCCCC4084440D0CCCCCCEC863440CCCCCCCC940A444038333333339B344066666666060F4440D0CCCCCC4CA83440CCCCCCCC6C134440A099999939AA344099999999891F4440D0CCCCCC6CB23440666666667625444068666666C6B7344066666666DE2A4440D0CCCCCC6CC0344099999999293244400000000020C53440CCCCCCCC04394440A099999959CE3440CCCCCCCCE43B444038333333B3E1344000000000483F44400000000040F33440CCCCCCCC1C4844400000000080003540CCCCCCCCAC4F444068666666E6073540666666664E54444038333333F307354000000000E05B444068666666E6FC3440CCCCCCCC3C634440D0CCCCCCACF4344099999999C96C4440A0999999D9F63440666666668E6F44406866666666F534409999999999734440A0999999F9EE3440666666667E75444068666666C6DE344000000000E073444068666666A6BD3440CCCCCCCCD47644403833333393B53440CCCCCCCCE487444038333333F3A7344099999999A18A4440D0CCCCCC4C9D3440CCCCCCCC5C9044400000000060913440CCCCCCCCE4A24440D0CCCCCC2C7D3440CCCCCCCC04AB4440D0CCCCCCAC7C34409999999919B24440D0CCCCCC0C7E344099999999B9C24440A0999999D9723440CCCCCCCCECC6444000000000C07934409999999991C9444068666666268434403333333343D044400000000040843440666666666EDA444038333333538134409999999961EE4440A0999999998D3440CCCCCCCCD4EF444038333333F3903440666666666EF54440A0999999D9943440CCCCCCCCAC014540D0CCCCCC4C93344033333333F3154540A0999999D985344000000000981C454068666666467C3440999999993123454068666666866834406666666686274540686666662659344033333333632B454038333333933D34403333333383364540D0CCCCCC8C2F3440000000002843454000000000801A3440CCCCCCCC0C464540000000006010344001000000020000000001000000FFFFFFFF0000000003, 1, @CurrentDateTime, @EndOfTime)
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/PostDeploymentScripts/pds230-ins-sales-customers.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/PostDeploymentScripts/pds230-ins-sales-customers.sql
index 0dac73e1..4ce2f2ef 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/PostDeploymentScripts/pds230-ins-sales-customers.sql
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/PostDeploymentScripts/pds230-ins-sales-customers.sql
@@ -197,15 +197,15 @@ BEGIN
     @randomSecondaryAddress = @PostalAddressLine2 OUTPUT;
   
   -- Get the geography for this location
-  SET @DeliveryLocation = [DataLoadSimulation].[GetCityLocation] (@myCityId)
+  SET @DeliveryLocation = [DataLoadSimulation].[GetCityLocation] (@myCityID)
 
   -- Generate some bogative postal codes
   EXEC [DataLoadSimulation].[GetBogativePostalCode] 
-      @CityID = @myCityId
+      @CityID = @myCityID
     , @PostalCode = @DeliveryPostalCode OUTPUT
 
   EXEC [DataLoadSimulation].[GetBogativePostalCode] 
-      @CityID = @myCityId
+      @CityID = @myCityID
     , @PostalCode = @PostalPostalCode OUTPUT
   
   SET @CreditLimit = CEILING(RAND() * 30) * 100 + 1000;
@@ -335,15 +335,15 @@ BEGIN
       @randomSecondaryAddress = @PostalAddressLine2 OUTPUT;
     
     -- Get the geography for this location
-    SET @DeliveryLocation = [DataLoadSimulation].[GetCityLocation] (@myCityId)
+    SET @DeliveryLocation = [DataLoadSimulation].[GetCityLocation] (@myCityID)
     
     -- Generate some bogative postal codes
     EXEC [DataLoadSimulation].[GetBogativePostalCode] 
-        @CityID = @myCityId
+        @CityID = @myCityID
       , @PostalCode = @DeliveryPostalCode OUTPUT
     
     EXEC [DataLoadSimulation].[GetBogativePostalCode] 
-        @CityID = @myCityId
+        @CityID = @myCityID
       , @PostalCode = @PostalPostalCode OUTPUT
     
     -- Get a random customer category for this sub office
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/PostDeploymentScripts/pds410-update-archive-tables.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/PostDeploymentScripts/pds410-update-archive-tables.sql
index 5e592a9b..3bd88406 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/PostDeploymentScripts/pds410-update-archive-tables.sql
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/PostDeploymentScripts/pds410-update-archive-tables.sql
@@ -4,7 +4,7 @@
 
 PRINT N'Updating StockItems history...'
 GO
-EXEC DataloadSimulation.DeactivatetemporalTablesBeforeDataLoad;
+EXEC DataLoadSimulation.DeactivateTemporalTablesBeforeDataLoad;
 GO
 UPDATE Warehouse.StockItems_Archive
 SET UnitPrice = s.UnitPrice * (1 - .05 *(DATEDIFF(DAY, sa.ValidFrom, GETDATE())/365 )),
@@ -17,5 +17,5 @@ SET UnitPrice = s.UnitPrice * (1 - .05 *(DATEDIFF(DAY, sa.ValidFrom, GETDATE())/
 		JOIN Warehouse.StockItems s
 			ON sa.StockItemID = s.StockItemID;
 GO
-EXEC DataloadSimulation.ReActivatetemporalTablesAfterDataLoad;
+EXEC DataLoadSimulation.ReactivateTemporalTablesAfterDataLoad;
 GO
\ No newline at end of file