Index: branches/5.2.x/install/upgrades.sql
===================================================================
diff -u -N -r14961 -r15009
--- branches/5.2.x/install/upgrades.sql	(.../upgrades.sql)	(revision 14961)
+++ branches/5.2.x/install/upgrades.sql	(.../upgrades.sql)	(revision 15009)
@@ -227,11 +227,9 @@
 # ===== v 5.2.0-B1 =====
 UPDATE SearchConfig
 SET DisplayName = REPLACE(DisplayName, 'lu_', 'lc_')
-WHERE DisplayName IN (
-	'lu_field_descriptionex', 'lu_field_manufacturer', 'lu_field_qtysold', 'lu_field_topseller'
-);
+WHERE DisplayName IN ('lu_field_descriptionex', 'lu_field_manufacturer', 'lu_field_qtysold', 'lu_field_topseller');
 
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'OrderVATIncluded', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_config_OrderVATIncluded', 'checkbox', NULL, NULL, 10.12, '0', '0', NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'OrderVATIncluded', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_config_OrderVATIncluded', 'checkbox', NULL, NULL, 10.12, '0', '0', NULL);
 
 ALTER TABLE Orders ADD VATIncluded TINYINT(1) UNSIGNED NOT NULL DEFAULT '0';
 
@@ -240,19 +238,19 @@
 	(DEFAULT, 'p', 'Price', 'range', 1, 11),
 	(DEFAULT, 'p', 'EditorsPick', 'radio', 1, NULL);
 
-DELETE FROM Phrase WHERE PhraseKey = 'LA_COL_ITEMNAME';
+DELETE FROM LanguageLabels WHERE PhraseKey = 'LA_COL_ITEMNAME';
 
-DELETE FROM Phrase
+DELETE FROM LanguageLabels
 WHERE PhraseKey IN ('LA_ALLOWORDERINGINNONPRIMARYCURRENCY', 'LA_ALLOWORDERDIFFERENTTYPES');
 
-DELETE FROM ConfigurationValues
+DELETE FROM SystemSettings
 WHERE VariableName IN ('Comm_AllowOrderingInNonPrimaryCurrency', 'Comm_Allow_Order_Different_Types');
 
-UPDATE ConfigurationValues
+UPDATE SystemSettings
 SET DisplayOrder = 20.01
 WHERE VariableName = 'Comm_ExchangeRateSource';
 
-UPDATE ConfigurationValues
+UPDATE SystemSettings
 SET DisplayOrder = DisplayOrder - 0.01
 WHERE VariableName IN (
 	'Comm_Enable_Backordering', 'Comm_Process_Backorders_Auto', 'Comm_Next_Order_Number', 'Comm_Order_Number_Format_P',