Add `Wix4` table prefixes.

Per https://github.com/wixtoolset/issues/issues/5933.

4 files changed, 60 insertions, 60 deletions

diff --git a/src/ca/snisslcert.cpp b/src/ca/snisslcert.cpp
index 466ef0b9..3a7336af 100644
--- a/src/ca/snisslcert.cpp
+++ b/src/ca/snisslcert.cpp
@@ -85,8 +85,8 @@ static void SetSniSslCertSetKey(
 
 
 LPCWSTR vcsWixHttpSniSslCertQuery =
-L"SELECT `WixHttpSniSslCert`.`WixHttpSniSslCert`, `WixHttpSniSslCert`.`Host`, `WixHttpSniSslCert`.`Port`, `WixHttpSniSslCert`.`Thumbprint`, `WixHttpSniSslCert`.`AppId`, `WixHttpSniSslCert`.`Store`, `WixHttpSniSslCert`.`HandleExisting`, `WixHttpSniSslCert`.`Component_` "
-L"FROM `WixHttpSniSslCert`";
+L"SELECT `Wix4HttpSniSslCert`.`Wix4HttpSniSslCert`, `Wix4HttpSniSslCert`.`Host`, `Wix4HttpSniSslCert`.`Port`, `Wix4HttpSniSslCert`.`Thumbprint`, `Wix4HttpSniSslCert`.`AppId`, `Wix4HttpSniSslCert`.`Store`, `Wix4HttpSniSslCert`.`HandleExisting`, `Wix4HttpSniSslCert`.`Component_` "
+L"FROM `Wix4HttpSniSslCert`";
 enum eWixHttpSniSslCertQuery { hurqId = 1, hurqHost, hurqPort, hurqCertificateThumbprint, hurqAppId, hurqCertificateStore, hurqHandleExisting, hurqComponent };
 
 /******************************************************************
@@ -320,17 +320,17 @@ static UINT SchedHttpSniSslCerts(
     HTTP_SERVICE_CONFIG_SSL_SNI_SET* pExistingSniSslSet = NULL;
 
     // Anything to do?
-    hr = WcaTableExists(L"WixHttpSniSslCert");
-    ExitOnFailure(hr, "Failed to check if the WixHttpSniSslCert table exists");
+    hr = WcaTableExists(L"Wix4HttpSniSslCert");
+    ExitOnFailure(hr, "Failed to check if the Wix4HttpSniSslCert table exists");
     if (S_FALSE == hr)
     {
-        WcaLog(LOGMSG_STANDARD, "WixHttpSniSslCert table doesn't exist, so there are no URL reservations to configure");
+        WcaLog(LOGMSG_STANDARD, "Wix4HttpSniSslCert table doesn't exist, so there are no URL reservations to configure");
         ExitFunction();
     }
 
     // Query and loop through all the SNI SSL certificates.
     hr = WcaOpenExecuteView(vcsWixHttpSniSslCertQuery, &hView);
-    ExitOnFailure(hr, "Failed to open view on the WixHttpSniSslCert table");
+    ExitOnFailure(hr, "Failed to open view on the Wix4HttpSniSslCert table");
 
     hr = HRESULT_FROM_WIN32(::HttpInitialize(HTTPAPI_VERSION_1, HTTP_INITIALIZE_CONFIG, NULL));
     ExitOnFailure(hr, "Failed to initialize HTTP Server configuration");
@@ -340,66 +340,66 @@ static UINT SchedHttpSniSslCerts(
     while (S_OK == (hr = WcaFetchRecord(hView, &hRec)))
     {
         hr = WcaGetRecordString(hRec, hurqId, &sczId);
-        ExitOnFailure(hr, "Failed to get WixHttpSniSslCert.WixHttpSniSslCert");
+        ExitOnFailure(hr, "Failed to get Wix4HttpSniSslCert.Wix4HttpSniSslCert");
 
         hr = WcaGetRecordString(hRec, hurqComponent, &sczComponent);
-        ExitOnFailure(hr, "Failed to get WixHttpSniSslCert.Component_");
+        ExitOnFailure(hr, "Failed to get Wix4HttpSniSslCert.Component_");
 
         // Figure out what we're doing for this reservation, treating reinstall the same as install.
         todoComponent = WcaGetComponentToDo(sczComponent);
         if ((WCA_TODO_REINSTALL == todoComponent ? WCA_TODO_INSTALL : todoComponent) != todoSched)
         {
-            WcaLog(LOGMSG_STANDARD, "Component '%ls' action state (%d) doesn't match request (%d) for WixHttpSniSslCert '%ls'", sczComponent, todoComponent, todoSched, sczId);
+            WcaLog(LOGMSG_STANDARD, "Component '%ls' action state (%d) doesn't match request (%d) for Wix4HttpSniSslCert '%ls'", sczComponent, todoComponent, todoSched, sczId);
             continue;
         }
 
         hr = WcaGetRecordFormattedString(hRec, hurqHost, &sczHost);
-        ExitOnFailure(hr, "Failed to get WixHttpSniSslCert.Host");
+        ExitOnFailure(hr, "Failed to get Wix4HttpSniSslCert.Host");
 
         hr = WcaGetRecordFormattedInteger(hRec, hurqPort, &iPort);
-        ExitOnFailure(hr, "Failed to get WixHttpSniSslCert.Port");
+        ExitOnFailure(hr, "Failed to get Wix4HttpSniSslCert.Port");
 
         hr = WcaGetRecordFormattedString(hRec, hurqCertificateThumbprint, &sczCertificateThumbprint);
-        ExitOnFailure(hr, "Failed to get WixHttpSniSslCert.CertificateThumbprint");
+        ExitOnFailure(hr, "Failed to get Wix4HttpSniSslCert.CertificateThumbprint");
 
         if (!sczHost || !*sczHost)
         {
             hr = E_INVALIDARG;
-            ExitOnFailure(hr, "Require a Host value for WixHttpSniSslCert '%ls'", sczId);
+            ExitOnFailure(hr, "Require a Host value for Wix4HttpSniSslCert '%ls'", sczId);
         }
 
         if (!iPort)
         {
             hr = E_INVALIDARG;
-            ExitOnFailure(hr, "Require a Port value for WixHttpSniSslCert '%ls'", sczId);
+            ExitOnFailure(hr, "Require a Port value for Wix4HttpSniSslCert '%ls'", sczId);
         }
 
         if (!sczCertificateThumbprint || !*sczCertificateThumbprint)
         {
             hr = E_INVALIDARG;
-            ExitOnFailure(hr, "Require a CertificateThumbprint value for WixHttpSniSslCert '%ls'", sczId);
+            ExitOnFailure(hr, "Require a CertificateThumbprint value for Wix4HttpSniSslCert '%ls'", sczId);
         }
 
         hr = WcaGetRecordFormattedString(hRec, hurqAppId, &sczAppId);
-        ExitOnFailure(hr, "Failed to get AppId for WixHttpSniSslCert '%ls'", sczId);
+        ExitOnFailure(hr, "Failed to get AppId for Wix4HttpSniSslCert '%ls'", sczId);
 
         hr = WcaGetRecordFormattedString(hRec, hurqCertificateStore, &sczCertificateStore);
-        ExitOnFailure(hr, "Failed to get CertificateStore for WixHttpSniSslCert '%ls'", sczId);
+        ExitOnFailure(hr, "Failed to get CertificateStore for Wix4HttpSniSslCert '%ls'", sczId);
 
         hr = WcaGetRecordInteger(hRec, hurqHandleExisting, &iHandleExisting);
-        ExitOnFailure(hr, "Failed to get HandleExisting for WixHttpSniSslCert '%ls'", sczId);
+        ExitOnFailure(hr, "Failed to get HandleExisting for Wix4HttpSniSslCert '%ls'", sczId);
 
         hr = GetSniSslCert(sczHost, iPort, &pExistingSniSslSet);
-        ExitOnFailure(hr, "Failed to get the existing SNI SSL certificate for WixHttpSniSslCert '%ls'", sczId);
+        ExitOnFailure(hr, "Failed to get the existing SNI SSL certificate for Wix4HttpSniSslCert '%ls'", sczId);
 
         hr = EnsureAppId(&sczAppId, pExistingSniSslSet);
-        ExitOnFailure(hr, "Failed to ensure AppId for WixHttpSniSslCert '%ls'", sczId);
+        ExitOnFailure(hr, "Failed to ensure AppId for Wix4HttpSniSslCert '%ls'", sczId);
 
         hr = WriteExistingSniSslCert(todoComponent, sczId, sczHost, iPort, iHandleExisting, pExistingSniSslSet, &sczRollbackCustomActionData);
-        ExitOnFailure(hr, "Failed to write rollback custom action data for WixHttpSniSslCert '%ls'", sczId);
+        ExitOnFailure(hr, "Failed to write rollback custom action data for Wix4HttpSniSslCert '%ls'", sczId);
 
         hr = WriteSniSslCert(todoComponent, sczId, sczHost, iPort, iHandleExisting, sczCertificateThumbprint, sczAppId, sczCertificateStore, &sczCustomActionData);
-        ExitOnFailure(hr, "Failed to write custom action data for WixHttpSniSslCert '%ls'", sczId);
+        ExitOnFailure(hr, "Failed to write custom action data for Wix4HttpSniSslCert '%ls'", sczId);
         ++cCertificates;
 
         ReleaseNullMem(pExistingSniSslSet);
@@ -410,7 +410,7 @@ static UINT SchedHttpSniSslCerts(
     {
         hr = S_OK;
     }
-    ExitOnFailure(hr, "Failure occurred while processing WixHttpSniSslCert table");
+    ExitOnFailure(hr, "Failure occurred while processing Wix4HttpSniSslCert table");
 
     // Schedule ExecHttpSniSslCerts if there's anything to do.
     if (cCertificates)
@@ -475,16 +475,16 @@ static HRESULT WriteExistingSniSslCert(
     if (pSniSslSet)
     {
         hr = StrAllocHexEncode(reinterpret_cast<BYTE*>(pSniSslSet->ParamDesc.pSslHash), pSniSslSet->ParamDesc.SslHashLength, &sczCertificateThumbprint);
-        ExitOnFailure(hr, "Failed to convert existing certificate thumbprint to hex for WixHttpSniSslCert '%ls'", wzId);
+        ExitOnFailure(hr, "Failed to convert existing certificate thumbprint to hex for Wix4HttpSniSslCert '%ls'", wzId);
 
         hr = StringFromGuid(pSniSslSet->ParamDesc.AppId, &sczAppId);
-        ExitOnFailure(hr, "Failed to copy existing AppId for WixHttpSniSslCert '%ls'", wzId);
+        ExitOnFailure(hr, "Failed to copy existing AppId for Wix4HttpSniSslCert '%ls'", wzId);
 
         wzCertificateStore = pSniSslSet->ParamDesc.pSslCertStoreName;
     }
 
     hr = WriteSniSslCert(action, wzId, wzHost, iPort, iHandleExisting, sczCertificateThumbprint ? sczCertificateThumbprint : L"", sczAppId ? sczAppId : L"", wzCertificateStore ? wzCertificateStore : L"", psczCustomActionData);
-    ExitOnFailure(hr, "Failed to write custom action data for WixHttpSniSslCert '%ls'", wzId);
+    ExitOnFailure(hr, "Failed to write custom action data for Wix4HttpSniSslCert '%ls'", wzId);
 
 LExit:
     ReleaseStr(sczAppId);
diff --git a/src/ca/wixhttpca.cpp b/src/ca/wixhttpca.cpp
index 0355f718..8c846ffc 100644
--- a/src/ca/wixhttpca.cpp
+++ b/src/ca/wixhttpca.cpp
@@ -30,14 +30,14 @@ HTTPAPI_VERSION vcHttpVersion = HTTPAPI_VERSION_1;
 ULONG vcHttpFlags = HTTP_INITIALIZE_CONFIG;
 
 LPCWSTR vcsHttpUrlReservationQuery =
-    L"SELECT `WixHttpUrlReservation`.`WixHttpUrlReservation`, `WixHttpUrlReservation`.`HandleExisting`, `WixHttpUrlReservation`.`Sddl`, `WixHttpUrlReservation`.`Url`, `WixHttpUrlReservation`.`Component_` "
-    L"FROM `WixHttpUrlReservation`";
+    L"SELECT `Wix4HttpUrlReservation`.`Wix4HttpUrlReservation`, `Wix4HttpUrlReservation`.`HandleExisting`, `Wix4HttpUrlReservation`.`Sddl`, `Wix4HttpUrlReservation`.`Url`, `Wix4HttpUrlReservation`.`Component_` "
+    L"FROM `Wix4HttpUrlReservation`";
 enum eHttpUrlReservationQuery { hurqId = 1, hurqHandleExisting, hurqSDDL, hurqUrl, hurqComponent };
 
 LPCWSTR vcsHttpUrlAceQuery =
-    L"SELECT `WixHttpUrlAce`.`SecurityPrincipal`, `WixHttpUrlAce`.`Rights` "
-    L"FROM `WixHttpUrlAce` "
-    L"WHERE `WixHttpUrlAce`.`WixHttpUrlReservation_`=?";
+    L"SELECT `Wix4HttpUrlAce`.`SecurityPrincipal`, `Wix4HttpUrlAce`.`Rights` "
+    L"FROM `Wix4HttpUrlAce` "
+    L"WHERE `Wix4HttpUrlAce`.`Wix4HttpUrlReservation_`=?";
 enum eHttpUrlAceQuery { huaqSecurityPrincipal = 1, huaqRights };
 
 /******************************************************************
@@ -80,21 +80,21 @@ static UINT SchedHttpUrlReservations(
     ExitOnFailure(hr, "Failed to initialize.");
 
     // Anything to do?
-    hr = WcaTableExists(L"WixHttpUrlReservation");
-    ExitOnFailure(hr, "Failed to check if the WixHttpUrlReservation table exists.");
+    hr = WcaTableExists(L"Wix4HttpUrlReservation");
+    ExitOnFailure(hr, "Failed to check if the Wix4HttpUrlReservation table exists.");
     if (S_FALSE == hr)
     {
-        WcaLog(LOGMSG_STANDARD, "WixHttpUrlReservation table doesn't exist, so there are no URL reservations to configure.");
+        WcaLog(LOGMSG_STANDARD, "Wix4HttpUrlReservation table doesn't exist, so there are no URL reservations to configure.");
         ExitFunction();
     }
 
-    hr = WcaTableExists(L"WixHttpUrlAce");
-    ExitOnFailure(hr, "Failed to check if the WixHttpUrlAce table exists.");
+    hr = WcaTableExists(L"Wix4HttpUrlAce");
+    ExitOnFailure(hr, "Failed to check if the Wix4HttpUrlAce table exists.");
     fAceTableExists = S_OK == hr;
 
     // Query and loop through all the URL reservations.
     hr = WcaOpenExecuteView(vcsHttpUrlReservationQuery, &hView);
-    ExitOnFailure(hr, "Failed to open view on the WixHttpUrlReservation table.");
+    ExitOnFailure(hr, "Failed to open view on the Wix4HttpUrlReservation table.");
 
     hr = HRESULT_FROM_WIN32(::HttpInitialize(vcHttpVersion, vcHttpFlags, NULL));
     ExitOnFailure(hr, "Failed to initialize HTTP Server configuration.");
@@ -104,10 +104,10 @@ static UINT SchedHttpUrlReservations(
     while (S_OK == (hr = WcaFetchRecord(hView, &hRec)))
     {
         hr = WcaGetRecordString(hRec, hurqId, &sczId);
-        ExitOnFailure(hr, "Failed to get WixHttpUrlReservation.WixHttpUrlReservation");
+        ExitOnFailure(hr, "Failed to get Wix4HttpUrlReservation.Wix4HttpUrlReservation");
 
         hr = WcaGetRecordString(hRec, hurqComponent, &sczComponent);
-        ExitOnFailure(hr, "Failed to get WixHttpUrlReservation.Component_");
+        ExitOnFailure(hr, "Failed to get Wix4HttpUrlReservation.Component_");
 
         // Figure out what we're doing for this reservation, treating reinstall the same as install.
         todoComponent = WcaGetComponentToDo(sczComponent);
@@ -118,10 +118,10 @@ static UINT SchedHttpUrlReservations(
         }
 
         hr = WcaGetRecordFormattedString(hRec, hurqUrl, &sczUrl);
-        ExitOnFailure(hr, "Failed to get WixHttpUrlReservation.Url");
+        ExitOnFailure(hr, "Failed to get Wix4HttpUrlReservation.Url");
 
         hr = WcaGetRecordInteger(hRec, hurqHandleExisting, &iHandleExisting);
-        ExitOnFailure(hr, "Failed to get WixHttpUrlReservation.HandleExisting");
+        ExitOnFailure(hr, "Failed to get Wix4HttpUrlReservation.HandleExisting");
 
         if (::MsiRecordIsNull(hRec, hurqSDDL))
         {
@@ -133,20 +133,20 @@ static UINT SchedHttpUrlReservations(
             {
                 hQueryReq = ::MsiCreateRecord(1);
                 hr = WcaSetRecordString(hQueryReq, 1, sczId);
-                ExitOnFailure(hr, "Failed to create record for querying WixHttpUrlAce table for reservation %ls", sczId);
+                ExitOnFailure(hr, "Failed to create record for querying Wix4HttpUrlAce table for reservation %ls", sczId);
 
                 hr = WcaOpenView(vcsHttpUrlAceQuery, &hAceView);
-                ExitOnFailure(hr, "Failed to open view on WixHttpUrlAce table for reservation %ls", sczId);
+                ExitOnFailure(hr, "Failed to open view on Wix4HttpUrlAce table for reservation %ls", sczId);
                 hr = WcaExecuteView(hAceView, hQueryReq);
-                ExitOnFailure(hr, "Failed to execute view on WixHttpUrlAce table for reservation %ls", sczId);
+                ExitOnFailure(hr, "Failed to execute view on Wix4HttpUrlAce table for reservation %ls", sczId);
 
                 while (S_OK == (hr = WcaFetchRecord(hAceView, &hRec)))
                 {
                     hr = WcaGetRecordFormattedString(hRec, huaqSecurityPrincipal, &sczSecurityPrincipal);
-                    ExitOnFailure(hr, "Failed to get WixHttpUrlAce.SecurityPrincipal");
+                    ExitOnFailure(hr, "Failed to get Wix4HttpUrlAce.SecurityPrincipal");
 
                     hr = WcaGetRecordInteger(hRec, huaqRights, &iRights);
-                    ExitOnFailure(hr, "Failed to get WixHttpUrlAce.Rights");
+                    ExitOnFailure(hr, "Failed to get Wix4HttpUrlAce.Rights");
 
                     hr = AppendUrlAce(sczSecurityPrincipal, iRights, &sczSDDL);
                     ExitOnFailure(hr, "Failed to append URL ACE.");
@@ -156,13 +156,13 @@ static UINT SchedHttpUrlReservations(
                 {
                     hr = S_OK;
                 }
-                ExitOnFailure(hr, "Failed to enumerate selected rows from WixHttpUrlAce table.");
+                ExitOnFailure(hr, "Failed to enumerate selected rows from Wix4HttpUrlAce table.");
             }
         }
         else
         {
             hr = WcaGetRecordFormattedString(hRec, hurqSDDL, &sczSDDL);
-            ExitOnFailure(hr, "Failed to get WixHttpUrlReservation.SDDL");
+            ExitOnFailure(hr, "Failed to get Wix4HttpUrlReservation.SDDL");
         }
 
         hr = GetUrlReservation(sczUrl, &sczExistingSDDL);
@@ -181,7 +181,7 @@ static UINT SchedHttpUrlReservations(
     {
         hr = S_OK;
     }
-    ExitOnFailure(hr, "Failure occurred while processing WixHttpUrlReservation table.");
+    ExitOnFailure(hr, "Failure occurred while processing Wix4HttpUrlReservation table.");
 
     // Schedule ExecHttpUrlReservations if there's anything to do.
     if (cUrlReservations)
diff --git a/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs b/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs
index 1d350bdf..40b49327 100644
--- a/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs
@@ -15,7 +15,7 @@ namespace WixToolsetTest.Http
             var folder = TestData.Get("TestData", "SniSsl");
             var build = new Builder(folder, typeof(HttpExtensionFactory), new[] { folder });
 
-            var results = build.BuildAndQuery(Build, "CustomAction", "WixHttpSniSslCert");
+            var results = build.BuildAndQuery(Build, "CustomAction", "Wix4HttpSniSslCert");
             WixAssert.CompareLineByLine(new[]
             {
                 "CustomAction:Wix4ExecHttpSniSslCertsInstall_X86\t3073\tWix4HttpCA_X86\tExecHttpSniSslCerts\t",
@@ -24,7 +24,7 @@ namespace WixToolsetTest.Http
                 "CustomAction:Wix4RollbackHttpSniSslCertsUninstall_X86\t3329\tWix4HttpCA_X86\tExecHttpSniSslCerts\t",
                 "CustomAction:Wix4SchedHttpSniSslCertsInstall_X86\t1\tWix4HttpCA_X86\tSchedHttpSniSslCertsInstall\t",
                 "CustomAction:Wix4SchedHttpSniSslCertsUninstall_X86\t1\tWix4HttpCA_X86\tSchedHttpSniSslCertsUninstall\t",
-                "WixHttpSniSslCert:sslC9YX6_H7UL_WGBx4DoDGI.Sj.D0\texample.com\t8080\t[SOME_THUMBPRINT]\t\t\t2\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
+                "Wix4HttpSniSslCert:sslC9YX6_H7UL_WGBx4DoDGI.Sj.D0\texample.com\t8080\t[SOME_THUMBPRINT]\t\t\t2\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
             }, results);
         }
 
@@ -34,7 +34,7 @@ namespace WixToolsetTest.Http
             var folder = TestData.Get(@"TestData\UsingUrlReservation");
             var build = new Builder(folder, typeof(HttpExtensionFactory), new[] { folder });
 
-            var results = build.BuildAndQuery(Build, "CustomAction", "WixHttpUrlAce", "WixHttpUrlReservation");
+            var results = build.BuildAndQuery(Build, "CustomAction", "Wix4HttpUrlAce", "Wix4HttpUrlReservation");
             WixAssert.CompareLineByLine(new[]
             {
                 "CustomAction:Wix4ExecHttpUrlReservationsInstall_X86\t3073\tWix4HttpCA_X86\tExecHttpUrlReservations\t",
@@ -43,8 +43,8 @@ namespace WixToolsetTest.Http
                 "CustomAction:Wix4RollbackHttpUrlReservationsUninstall_X86\t3329\tWix4HttpCA_X86\tExecHttpUrlReservations\t",
                 "CustomAction:Wix4SchedHttpUrlReservationsInstall_X86\t1\tWix4HttpCA_X86\tSchedHttpUrlReservationsInstall\t",
                 "CustomAction:Wix4SchedHttpUrlReservationsUninstall_X86\t1\tWix4HttpCA_X86\tSchedHttpUrlReservationsUninstall\t",
-                "WixHttpUrlAce:aceu5os2gQoblRmzwjt85LQf997uD4\turlO23FkY2xzEY54lY6E6sXFW6glXc\tNT SERVICE\\TestService\t268435456",
-                "WixHttpUrlReservation:urlO23FkY2xzEY54lY6E6sXFW6glXc\t0\t\thttp://+:80/vroot/\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
+                "Wix4HttpUrlAce:aceu5os2gQoblRmzwjt85LQf997uD4\turlO23FkY2xzEY54lY6E6sXFW6glXc\tNT SERVICE\\TestService\t268435456",
+                "Wix4HttpUrlReservation:urlO23FkY2xzEY54lY6E6sXFW6glXc\t0\t\thttp://+:80/vroot/\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
             }, results);
         }
 
diff --git a/src/wixext/HttpTableDefinitions.cs b/src/wixext/HttpTableDefinitions.cs
index 83cd565a..431b9a33 100644
--- a/src/wixext/HttpTableDefinitions.cs
+++ b/src/wixext/HttpTableDefinitions.cs
@@ -7,11 +7,11 @@ namespace WixToolset.Http
     public static class HttpTableDefinitions
     {
         public static readonly TableDefinition WixHttpSniSslCert = new TableDefinition(
-            "WixHttpSniSslCert",
+            "Wix4HttpSniSslCert",
             HttpSymbolDefinitions.WixHttpSniSslCert,
             new[]
             {
-                new ColumnDefinition("WixHttpSniSslCert", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Wix4HttpSniSslCert", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Host", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Host for the SNI SSL certificate.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Port", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Port for the  SNI SSL certificate.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Thumbprint", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "humbprint of the SNI SSL certificate to find.", modularizeType: ColumnModularizeType.Property),
@@ -24,11 +24,11 @@ namespace WixToolset.Http
         );
 
         public static readonly TableDefinition WixHttpUrlReservation = new TableDefinition(
-            "WixHttpUrlReservation",
+            "Wix4HttpUrlReservation",
             HttpSymbolDefinitions.WixHttpUrlReservation,
             new[]
             {
-                new ColumnDefinition("WixHttpUrlReservation", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Wix4HttpUrlReservation", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("HandleExisting", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2, description: "The behavior when trying to install a URL reservation and it already exists."),
                 new ColumnDefinition("Sddl", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Security descriptor for the URL reservation.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Url", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "URL to be reserved.", modularizeType: ColumnModularizeType.Property),
@@ -38,11 +38,11 @@ namespace WixToolset.Http
         );
 
         public static readonly TableDefinition WixHttpUrlAce = new TableDefinition(
-            "WixHttpUrlAce",
+            "Wix4HttpUrlAce",
             HttpSymbolDefinitions.WixHttpUrlAce,
             new[]
             {
-                new ColumnDefinition("WixHttpUrlAce", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Wix4HttpUrlAce", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("WixHttpUrlReservation_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "WixHttpUrlReservation", keyColumn: 1, description: "Foreign key into the WixHttpUrlReservation table.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("SecurityPrincipal", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The security principal for this ACE.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Rights", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 1073741824, description: "The rights for this ACE."),