diff --git a/XenAdmin/Wizards/DRWizards/DRFailoverWizardPrecheckPage.resx b/XenAdmin/Wizards/DRWizards/DRFailoverWizardPrecheckPage.resx
index adffe0b21..72678115a 100644
--- a/XenAdmin/Wizards/DRWizards/DRFailoverWizardPrecheckPage.resx
+++ b/XenAdmin/Wizards/DRWizards/DRFailoverWizardPrecheckPage.resx
@@ -139,7 +139,7 @@
     <value>13</value>
   </data>
   <data name="checkBoxViewPrecheckFailuresOnly.Text" xml:space="preserve">
-    <value>&amp;View only precheck failures/issues</value>
+    <value>&amp;View only pre-check failures/issues</value>
   </data>
   <data name="&gt;&gt;checkBoxViewPrecheckFailuresOnly.Name" xml:space="preserve">
     <value>checkBoxViewPrecheckFailuresOnly</value>
@@ -217,7 +217,7 @@
     <value>14</value>
   </data>
   <data name="labelPrecheckStatus.Text" xml:space="preserve">
-    <value>Failover prechecks completed: {0} issues found</value>
+    <value>Failover pre-checks completed: {0} issues found</value>
   </data>
   <data name="&gt;&gt;labelPrecheckStatus.Name" xml:space="preserve">
     <value>labelPrecheckStatus</value>
@@ -391,7 +391,7 @@
     <value>7</value>
   </data>
   <data name="labelPrechecksFirstLine.Text" xml:space="preserve">
-    <value>Failover prechecks are performed to ensure that the selected vApps and VMs can be failed over. Please take appropriate action to resolve any issues. </value>
+    <value>Failover pre-checks are performed to ensure that the selected vApps and VMs can be failed over. Please take appropriate action to resolve any issues. </value>
   </data>
   <data name="&gt;&gt;labelPrechecksFirstLine.Name" xml:space="preserve">
     <value>labelPrechecksFirstLine</value>
@@ -451,7 +451,7 @@
     <value>0</value>
   </data>
   <data name="label1.Text" xml:space="preserve">
-    <value>You need to resolve the issues found during prechecks before you can continue.</value>
+    <value>You need to resolve the issues found during pre-checks before you can continue.</value>
   </data>
   <data name="label1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleLeft</value>
diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.resx b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.resx
index 8e4ec9378..6a7dce5e1 100644
--- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.resx
+++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.resx
@@ -250,7 +250,7 @@
     <value>6</value>
   </data>
   <data name="checkBoxViewPrecheckFailuresOnly.Text" xml:space="preserve">
-    <value>&amp;Hide successful prechecks</value>
+    <value>&amp;Hide successful pre-checks</value>
   </data>
   <data name="&gt;&gt;checkBoxViewPrecheckFailuresOnly.Name" xml:space="preserve">
     <value>checkBoxViewPrecheckFailuresOnly</value>
diff --git a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeExtrasPage.resx b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeExtrasPage.resx
index efaae093e..345e6488f 100644
--- a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeExtrasPage.resx
+++ b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeExtrasPage.resx
@@ -325,7 +325,7 @@
     <value>8</value>
   </data>
   <data name="label6.Text" xml:space="preserve">
-    <value>Click Run Prechecks to begin running the upgrade prechecks.</value>
+    <value>Click Run Pre-checks to begin running the upgrade pre-checks.</value>
   </data>
   <data name="&gt;&gt;label6.Name" xml:space="preserve">
     <value>label6</value>
diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs
index daafca24d..5cfb670b9 100755
--- a/XenModel/Messages.Designer.cs
+++ b/XenModel/Messages.Designer.cs
@@ -19,7 +19,7 @@ namespace XenAdmin {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Messages {
@@ -13724,7 +13724,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Failover prechecks completed: {0} issues found.
+        ///   Looks up a localized string similar to Failover pre-checks completed: {0} issues found.
         /// </summary>
         public static string DR_WIZARD_PRECHECKPAGE_STATUS_FAILURE {
             get {
@@ -13742,7 +13742,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Failover prechecks completed: No issues found.
+        ///   Looks up a localized string similar to Failover pre-checks completed: No issues found.
         /// </summary>
         public static string DR_WIZARD_PRECHECKPAGE_STATUS_SUCCESS {
             get {
@@ -19198,7 +19198,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to No crashdumps to remove.
+        ///   Looks up a localized string similar to No crash dumps to remove.
         /// </summary>
         public static string HOST_NO_CRASHDUMPS {
             get {
@@ -19261,7 +19261,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Removed {0} crashdumps from {1}.
+        ///   Looks up a localized string similar to Removed {0} crash dumps from {1}.
         /// </summary>
         public static string HOST_REMOVED_MANY_CRASHDUMPS {
             get {
@@ -19270,7 +19270,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Removed 1 crashdump from {0}.
+        ///   Looks up a localized string similar to Removed 1 crash dump from {0}.
         /// </summary>
         public static string HOST_REMOVED_ONE_CRASHDUMP {
             get {
@@ -19279,7 +19279,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Removing crashdump {0} of {1} from {2}.
+        ///   Looks up a localized string similar to Removing crash dump {0} of {1} from {2}.
         /// </summary>
         public static string HOST_REMOVING_CRASHDUMP {
             get {
@@ -19288,7 +19288,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Removing crashdumps from {0}.
+        ///   Looks up a localized string similar to Removing crash dumps from {0}.
         /// </summary>
         public static string HOST_REMOVING_CRASHDUMPS_TITLE {
             get {
@@ -28480,7 +28480,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Running prechecks....
+        ///   Looks up a localized string similar to Running pre-checks....
         /// </summary>
         public static string PATCHING_WIZARD_RUNNING_PRECHECKS {
             get {
@@ -28762,7 +28762,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Revert resolved prechecks.
+        ///   Looks up a localized string similar to Revert resolved pre-checks.
         /// </summary>
         public static string PATCHINGWIZARD_PATCHINGPAGE_PRECHECK_REVERT {
             get {
@@ -28771,7 +28771,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Resolved prechecks reverted.
+        ///   Looks up a localized string similar to Resolved pre-checks reverted.
         /// </summary>
         public static string PATCHINGWIZARD_PATCHINGPAGE_PRECHECK_REVERTED {
             get {
@@ -28861,7 +28861,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Prechecks failed..
+        ///   Looks up a localized string similar to Pre-checks failed..
         /// </summary>
         public static string PATCHINGWIZARD_PRECHECKPAGE_FAILED {
             get {
@@ -28870,7 +28870,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update prechecks are performed to verify that the update &quot;{0}&quot; can be applied to the servers..
+        ///   Looks up a localized string similar to Update pre-checks are performed to verify that the update &quot;{0}&quot; can be applied to the servers..
         /// </summary>
         public static string PATCHINGWIZARD_PRECHECKPAGE_FIRSTLINE {
             get {
@@ -28879,7 +28879,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Prechecks are performed to verify that automated updates can proceed..
+        ///   Looks up a localized string similar to Pre-checks are performed to verify that automated updates can proceed..
         /// </summary>
         public static string PATCHINGWIZARD_PRECHECKPAGE_FIRSTLINE_AUTOMATED_UPDATES_MODE {
             get {
@@ -28888,7 +28888,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update prechecks are performed to verify that the selected update can be applied to the servers..
+        ///   Looks up a localized string similar to Update pre-checks are performed to verify that the selected update can be applied to the servers..
         /// </summary>
         public static string PATCHINGWIZARD_PRECHECKPAGE_FIRSTLINE_NO_PATCH_NAME {
             get {
@@ -28915,7 +28915,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Prechecks.
+        ///   Looks up a localized string similar to Pre-checks.
         /// </summary>
         public static string PATCHINGWIZARD_PRECHECKPAGE_TEXT {
             get {
@@ -28924,7 +28924,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Perform update prechecks on selected servers.
+        ///   Looks up a localized string similar to Perform update pre-checks on selected servers.
         /// </summary>
         public static string PATCHINGWIZARD_PRECHECKPAGE_TITLE {
             get {
@@ -29271,7 +29271,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The upload process was cancelled..
+        ///   Looks up a localized string similar to The upload process was canceled..
         /// </summary>
         public static string PATCHINGWIZARD_SINGLEUPLOAD_CANCELLATION {
             get {
@@ -31904,7 +31904,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Revert precheck actions.
+        ///   Looks up a localized string similar to Revert pre-check actions.
         /// </summary>
         public static string REVERT_PRECHECK_ACTIONS {
             get {
@@ -31940,7 +31940,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Reverting resolved prechecks....
+        ///   Looks up a localized string similar to Reverting resolved pre-checks....
         /// </summary>
         public static string REVERTING_RESOLVED_PRECHECKS {
             get {
@@ -31949,7 +31949,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Reverting resolved prechecks in {0}....
+        ///   Looks up a localized string similar to Reverting resolved pre-checks in {0}....
         /// </summary>
         public static string REVERTING_RESOLVED_PRECHECKS_POOL {
             get {
@@ -32283,7 +32283,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Upgrade prechecks are performed on all the pools you selected to ensure that all the servers can be upgraded..
+        ///   Looks up a localized string similar to Upgrade pre-checks are performed on all the pools you selected to ensure that all the servers can be upgraded..
         /// </summary>
         public static string ROLLINGUPGRADE_PRECHECKS {
             get {
@@ -32337,7 +32337,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &amp;Run Prechecks.
+        ///   Looks up a localized string similar to &amp;Run Pre-checks.
         /// </summary>
         public static string RUN_PRECHECKS_WITH_ACCESS_KEY {
             get {
@@ -36633,7 +36633,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update precheck failed on server &apos;{0}&apos;.
+        ///   Looks up a localized string similar to Update pre-check failed on server &apos;{0}&apos;.
         /// </summary>
         public static string UPDATES_WIZARD_PRECHECK_FAILED_TITLE {
             get {
@@ -36779,7 +36779,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Precheck for {0} in {1}....
+        ///   Looks up a localized string similar to Pre-check for {0} in {1}....
         /// </summary>
         public static string UPDATES_WIZARD_RUNNING_PRECHECK {
             get {
@@ -36923,7 +36923,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Prechecks.
+        ///   Looks up a localized string similar to Pre-checks.
         /// </summary>
         public static string UPGRADE_PRECHECKS_TEXT {
             get {
@@ -36932,7 +36932,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Perform upgrade prechecks on selected pools.
+        ///   Looks up a localized string similar to Perform upgrade pre-checks on selected pools.
         /// </summary>
         public static string UPGRADE_PRECHECKS_TITLE {
             get {
@@ -36977,7 +36977,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Upgrade Prechecks.
+        ///   Looks up a localized string similar to Upgrade Pre-checks.
         /// </summary>
         public static string UPGRADEWIZARD_PRECHECK_TEXT {
             get {
@@ -36986,7 +36986,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Problems encountered when performing upgrade prechecks..
+        ///   Looks up a localized string similar to Problems encountered when performing upgrade pre-checks..
         /// </summary>
         public static string UPGRADEWIZARD_PRECHECK_TITLE {
             get {
diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx
index 6ebaecc8a..4d6c0bddf 100755
--- a/XenModel/Messages.resx
+++ b/XenModel/Messages.resx
@@ -4859,13 +4859,13 @@ Eject the CD and try again.</value>
     <value>Resolve</value>
   </data>
   <data name="DR_WIZARD_PRECHECKPAGE_STATUS_FAILURE" xml:space="preserve">
-    <value>Failover prechecks completed: {0} issues found</value>
+    <value>Failover pre-checks completed: {0} issues found</value>
   </data>
   <data name="DR_WIZARD_PRECHECKPAGE_STATUS_RUNNING" xml:space="preserve">
     <value>Running failover pre-checks:</value>
   </data>
   <data name="DR_WIZARD_PRECHECKPAGE_STATUS_SUCCESS" xml:space="preserve">
-    <value>Failover prechecks completed: No issues found</value>
+    <value>Failover pre-checks completed: No issues found</value>
   </data>
   <data name="DR_WIZARD_PRECHECKPAGE_TEXT" xml:space="preserve">
     <value>Pre-checks</value>
@@ -6730,7 +6730,7 @@ This might result in failure to migrate VMs to this server during the RPU or to
     <value>Server is not reachable</value>
   </data>
   <data name="HOST_NO_CRASHDUMPS" xml:space="preserve">
-    <value>No crashdumps to remove</value>
+    <value>No crash dumps to remove</value>
   </data>
   <data name="HOST_POWER_ON" xml:space="preserve">
     <value>Server power on</value>
@@ -6748,16 +6748,16 @@ This might result in failure to migrate VMs to this server during the RPU or to
     <value>You must reboot your server '{0}' to complete the restore process.</value>
   </data>
   <data name="HOST_REMOVED_MANY_CRASHDUMPS" xml:space="preserve">
-    <value>Removed {0} crashdumps from {1}</value>
+    <value>Removed {0} crash dumps from {1}</value>
   </data>
   <data name="HOST_REMOVED_ONE_CRASHDUMP" xml:space="preserve">
-    <value>Removed 1 crashdump from {0}</value>
+    <value>Removed 1 crash dump from {0}</value>
   </data>
   <data name="HOST_REMOVING_CRASHDUMP" xml:space="preserve">
-    <value>Removing crashdump {0} of {1} from {2}</value>
+    <value>Removing crash dump {0} of {1} from {2}</value>
   </data>
   <data name="HOST_REMOVING_CRASHDUMPS_TITLE" xml:space="preserve">
-    <value>Removing crashdumps from {0}</value>
+    <value>Removing crash dumps from {0}</value>
   </data>
   <data name="HOST_RESTORED" xml:space="preserve">
     <value>Server '{0}' restored.</value>
@@ -9929,10 +9929,10 @@ This will cancel the update process and may leave your system in an unstable sta
     <value>Reverting pool problems...</value>
   </data>
   <data name="PATCHINGWIZARD_PATCHINGPAGE_PRECHECK_REVERT" xml:space="preserve">
-    <value>Revert resolved prechecks</value>
+    <value>Revert resolved pre-checks</value>
   </data>
   <data name="PATCHINGWIZARD_PATCHINGPAGE_PRECHECK_REVERTED" xml:space="preserve">
-    <value>Resolved prechecks reverted</value>
+    <value>Resolved pre-checks reverted</value>
   </data>
   <data name="PATCHINGWIZARD_PATCHINGPAGE_SERVER_RESOLVE" xml:space="preserve">
     <value>Resolve server problems</value>
@@ -9962,16 +9962,16 @@ This will cancel the update process and may leave your system in an unstable sta
     <value>Checking disk space requirements</value>
   </data>
   <data name="PATCHINGWIZARD_PRECHECKPAGE_FAILED" xml:space="preserve">
-    <value>Prechecks failed.</value>
+    <value>Pre-checks failed.</value>
   </data>
   <data name="PATCHINGWIZARD_PRECHECKPAGE_FIRSTLINE" xml:space="preserve">
-    <value>Update prechecks are performed to verify that the update "{0}" can be applied to the servers.</value>
+    <value>Update pre-checks are performed to verify that the update "{0}" can be applied to the servers.</value>
   </data>
   <data name="PATCHINGWIZARD_PRECHECKPAGE_FIRSTLINE_AUTOMATED_UPDATES_MODE" xml:space="preserve">
-    <value>Prechecks are performed to verify that automated updates can proceed.</value>
+    <value>Pre-checks are performed to verify that automated updates can proceed.</value>
   </data>
   <data name="PATCHINGWIZARD_PRECHECKPAGE_FIRSTLINE_NO_PATCH_NAME" xml:space="preserve">
-    <value>Update prechecks are performed to verify that the selected update can be applied to the servers.</value>
+    <value>Update pre-checks are performed to verify that the selected update can be applied to the servers.</value>
   </data>
   <data name="PATCHINGWIZARD_PRECHECKPAGE_RESOLVE" xml:space="preserve">
     <value>Resolve</value>
@@ -9980,10 +9980,10 @@ This will cancel the update process and may leave your system in an unstable sta
     <value>Resolving issues...</value>
   </data>
   <data name="PATCHINGWIZARD_PRECHECKPAGE_TEXT" xml:space="preserve">
-    <value>Prechecks</value>
+    <value>Pre-checks</value>
   </data>
   <data name="PATCHINGWIZARD_PRECHECKPAGE_TITLE" xml:space="preserve">
-    <value>Perform update prechecks on selected servers</value>
+    <value>Perform update pre-checks on selected servers</value>
   </data>
   <data name="PATCHINGWIZARD_REMOVED_UPDATES" xml:space="preserve">
     <value>Deleted update installation files</value>
@@ -10101,7 +10101,7 @@ Servers where this update cannot be applied appear disabled in this list.</value
     <value>The installation of update {0} was completed with warnings.</value>
   </data>
   <data name="PATCHINGWIZARD_SINGLEUPLOAD_CANCELLATION" xml:space="preserve">
-    <value>The upload process was cancelled.</value>
+    <value>The upload process was canceled.</value>
   </data>
   <data name="PATCHINGWIZARD_SINGLEUPLOAD_CANCELLATION_RECONSIDER" xml:space="preserve">
     <value>Are you sure you want to leave this page?
@@ -10169,7 +10169,7 @@ This will cancel the upload process.</value>
     <value>{0} ...</value>
   </data>
   <data name="PATCHING_WIZARD_RUNNING_PRECHECKS" xml:space="preserve">
-    <value>Running prechecks...</value>
+    <value>Running pre-checks...</value>
   </data>
   <data name="PATCHING_WIZARD_SOLVE_MANUALLY" xml:space="preserve">
     <value>Unable to resolve this issue:\n{0}\n\nPlease resolve this issue manually and then click Check Again.
@@ -11078,10 +11078,10 @@ Click Server Status Report to open the Compile Server Status Report Wizard or cl
     <value>Reverting the power state of {0}</value>
   </data>
   <data name="REVERTING_RESOLVED_PRECHECKS" xml:space="preserve">
-    <value>Reverting resolved prechecks...</value>
+    <value>Reverting resolved pre-checks...</value>
   </data>
   <data name="REVERTING_RESOLVED_PRECHECKS_POOL" xml:space="preserve">
-    <value>Reverting resolved prechecks in {0}...</value>
+    <value>Reverting resolved pre-checks in {0}...</value>
   </data>
   <data name="REVERTING_WIZARD_CHANGES" xml:space="preserve">
     <value>Reverting all changes done by this wizard</value>
@@ -11090,7 +11090,7 @@ Click Server Status Report to open the Compile Server Status Report Wizard or cl
     <value>        Revert pool state</value>
   </data>
   <data name="REVERT_PRECHECK_ACTIONS" xml:space="preserve">
-    <value>Revert precheck actions</value>
+    <value>Revert pre-check actions</value>
   </data>
   <data name="REVERT_WIZARD_CHANGES" xml:space="preserve">
     <value>Revert all changes done by this wizard</value>
@@ -11105,7 +11105,7 @@ Click Server Status Report to open the Compile Server Status Report Wizard or cl
     <value>{0} on '{1}'</value>
   </data>
   <data name="ROLLINGUPGRADE_PRECHECKS" xml:space="preserve">
-    <value>Upgrade prechecks are performed on all the pools you selected to ensure that all the servers can be upgraded.</value>
+    <value>Upgrade pre-checks are performed on all the pools you selected to ensure that all the servers can be upgraded.</value>
   </data>
   <data name="ROLLING_POOL_UPGRADE" xml:space="preserve">
     <value>Rolling Pool Upgrade</value>
@@ -11235,7 +11235,7 @@ The master must be upgraded first, so if you skip the master, the rolling pool u
     <value>Policy started</value>
   </data>
   <data name="RUN_PRECHECKS_WITH_ACCESS_KEY" xml:space="preserve">
-    <value>&amp;Run Prechecks</value>
+    <value>&amp;Run Pre-checks</value>
   </data>
   <data name="RUN_REPORT" xml:space="preserve">
     <value>&amp;Run Report</value>
@@ -12630,7 +12630,7 @@ Please check your settings and try again.</value>
     <value>{0}: Prerequisite update(s) are missing: {1}</value>
   </data>
   <data name="UPDATES_WIZARD_PRECHECK_FAILED_TITLE" xml:space="preserve">
-    <value>Update precheck failed on server '{0}'</value>
+    <value>Update pre-check failed on server '{0}'</value>
   </data>
   <data name="UPDATES_WIZARD_REBOOT" xml:space="preserve">
     <value>Reboot</value>
@@ -12680,7 +12680,7 @@ Please check your settings and try again.</value>
     <value>Click here to resume this VM</value>
   </data>
   <data name="UPDATES_WIZARD_RUNNING_PRECHECK" xml:space="preserve">
-    <value>Precheck for {0} in {1}...</value>
+    <value>Pre-check for {0} in {1}...</value>
   </data>
   <data name="UPDATES_WIZARD_SERVER_SELECTION_PROBLEM" xml:space="preserve">
     <value>{0}: The update needs to be applied on all servers in the pool.</value>
@@ -12764,10 +12764,10 @@ Note that if RBAC is enabled, only updates which you have privileges to dismiss
     <value>Applying the upgrade to the pool.</value>
   </data>
   <data name="UPGRADEWIZARD_PRECHECK_TEXT" xml:space="preserve">
-    <value>Upgrade Prechecks</value>
+    <value>Upgrade Pre-checks</value>
   </data>
   <data name="UPGRADEWIZARD_PRECHECK_TITLE" xml:space="preserve">
-    <value>Problems encountered when performing upgrade prechecks.</value>
+    <value>Problems encountered when performing upgrade pre-checks.</value>
   </data>
   <data name="UPGRADEWIZARD_PROBLEM_CFU_STATUS" xml:space="preserve">
     <value>Error encountered when checking ability to download updates.</value>
@@ -12806,10 +12806,10 @@ Note that if RBAC is enabled, only updates which you have privileges to dismiss
     <value>Upgrade pool master '{0}'</value>
   </data>
   <data name="UPGRADE_PRECHECKS_TEXT" xml:space="preserve">
-    <value>Prechecks</value>
+    <value>Pre-checks</value>
   </data>
   <data name="UPGRADE_PRECHECKS_TITLE" xml:space="preserve">
-    <value>Perform upgrade prechecks on selected pools</value>
+    <value>Perform upgrade pre-checks on selected pools</value>
   </data>
   <data name="UPGRADE_SERVER" xml:space="preserve">
     <value>Upgrade server '{0}</value>
diff --git a/XenModel/XenAPI/FriendlyErrorNames.Designer.cs b/XenModel/XenAPI/FriendlyErrorNames.Designer.cs
index 2b2e21ad2..c65647e20 100755
--- a/XenModel/XenAPI/FriendlyErrorNames.Designer.cs
+++ b/XenModel/XenAPI/FriendlyErrorNames.Designer.cs
@@ -2248,7 +2248,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The patch precheck stage failed: the server does not have enough space..
+        ///   Looks up a localized string similar to The patch pre-check stage failed: the server does not have enough space..
         /// </summary>
         public static string PATCH_PRECHECK_FAILED_OUT_OF_SPACE {
             get {
@@ -2257,7 +2257,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The update precheck stage failed: prerequisite updates are missing..
+        ///   Looks up a localized string similar to The update pre-check stage failed: prerequisite updates are missing..
         /// </summary>
         public static string PATCH_PRECHECK_FAILED_PREREQUISITE_MISSING {
             get {
@@ -2266,7 +2266,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The update precheck stage failed with an unknown error..
+        ///   Looks up a localized string similar to The update pre-check stage failed with an unknown error..
         /// </summary>
         public static string PATCH_PRECHECK_FAILED_UNKNOWN_ERROR {
             get {
@@ -2275,7 +2275,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The update precheck stage failed: there are one or more VMs still running on the server.  All VMs must be shut down or suspended before the update can be applied..
+        ///   Looks up a localized string similar to The update pre-check stage failed: there are one or more VMs still running on the server.  All VMs must be shut down or suspended before the update can be applied..
         /// </summary>
         public static string PATCH_PRECHECK_FAILED_VM_RUNNING {
             get {
@@ -4665,7 +4665,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The iScsi target and received IQNs do not match.
+        ///   Looks up a localized string similar to The iSCSI target and received IQNs do not match.
         /// </summary>
         public static string SR_BACKEND_FAILURE_84 {
             get {
@@ -4683,7 +4683,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The attempt to query the iSCSi daemon failed.
+        ///   Looks up a localized string similar to The attempt to query the iSCSI daemon failed.
         /// </summary>
         public static string SR_BACKEND_FAILURE_86 {
             get {
@@ -5016,7 +5016,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The request was asynchronously cancelled..
+        ///   Looks up a localized string similar to The request was asynchronously canceled..
         /// </summary>
         public static string TASK_CANCELLED {
             get {
@@ -5151,7 +5151,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The update precheck stage failed: conflicting update(s) are present..
+        ///   Looks up a localized string similar to The update pre-check stage failed: conflicting update(s) are present..
         /// </summary>
         public static string UPDATE_PRECHECK_FAILED_CONFLICT_PRESENT {
             get {
@@ -5160,7 +5160,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The update precheck stage failed: RPM package validation requires a GPG key that is not present on the host..
+        ///   Looks up a localized string similar to The update pre-check stage failed: RPM package validation requires a GPG key that is not present on the host..
         /// </summary>
         public static string UPDATE_PRECHECK_FAILED_GPGKEY_NOT_IMPORTED {
             get {
@@ -5169,7 +5169,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The update precheck stage failed: the server does not have enough space..
+        ///   Looks up a localized string similar to The update pre-check stage failed: the server does not have enough space..
         /// </summary>
         public static string UPDATE_PRECHECK_FAILED_OUT_OF_SPACE {
             get {
@@ -5178,7 +5178,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The update precheck stage failed: prerequisite update(s) are missing..
+        ///   Looks up a localized string similar to The update pre-check stage failed: prerequisite update(s) are missing..
         /// </summary>
         public static string UPDATE_PRECHECK_FAILED_PREREQUISITE_MISSING {
             get {
@@ -5187,7 +5187,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The update precheck stage failed with an unknown error..
+        ///   Looks up a localized string similar to The update pre-check stage failed with an unknown error..
         /// </summary>
         public static string UPDATE_PRECHECK_FAILED_UNKNOWN_ERROR {
             get {
@@ -5196,7 +5196,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The update precheck stage failed: the server is of an incorrect version..
+        ///   Looks up a localized string similar to The update pre-check stage failed: the server is of an incorrect version..
         /// </summary>
         public static string UPDATE_PRECHECK_FAILED_WRONG_SERVER_VERSION {
             get {
@@ -5943,7 +5943,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This operation is illegal because the VM is using nested virtualisation..
+        ///   Looks up a localized string similar to This operation is illegal because the VM is using nested virtualization..
         /// </summary>
         public static string VM_IS_USING_NESTED_VIRT {
             get {
@@ -6033,7 +6033,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This VM does not have a crashdump SR specified..
+        ///   Looks up a localized string similar to This VM does not have a crash dump SR specified..
         /// </summary>
         public static string VM_NO_CRASHDUMP_SR {
             get {
@@ -6420,7 +6420,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The WLB URL is invalid. Ensure it is in format: &lt;ipaddress&gt;:&lt;port&gt;. The configured/given URL is returned..
+        ///   Looks up a localized string similar to The WLB URL is invalid. Ensure it is in the format: &lt;ipaddress&gt;:&lt;port&gt;. The configured/given URL is returned..
         /// </summary>
         public static string WLB_URL_INVALID {
             get {
@@ -6519,7 +6519,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Could not find any volumes supported by the Vss Provider.
+        ///   Looks up a localized string similar to Could not find any volumes supported by the VSS Provider.
         /// </summary>
         public static string XEN_VSS_REQ_ERROR_NO_VOLUMES_SUPPORTED {
             get {
@@ -6537,7 +6537,7 @@ namespace XenAPI {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The Vss Provider is not loaded.
+        ///   Looks up a localized string similar to The VSS Provider is not loaded.
         /// </summary>
         public static string XEN_VSS_REQ_ERROR_PROV_NOT_LOADED {
             get {
diff --git a/XenModel/XenAPI/FriendlyErrorNames.ja.resx b/XenModel/XenAPI/FriendlyErrorNames.ja.resx
index 0a293941e..cc4a4e3b8 100644
--- a/XenModel/XenAPI/FriendlyErrorNames.ja.resx
+++ b/XenModel/XenAPI/FriendlyErrorNames.ja.resx
@@ -2280,13 +2280,13 @@
     <value>VSS リクエスタの初期化に失敗しました。</value>
   </data>
   <data name="XEN_VSS_REQ_ERROR_NO_VOLUMES_SUPPORTED" xml:space="preserve">
-    <value>Vss Provider でサポートされるボリュームが見つかりません</value>
+    <value>VSS Provider でサポートされるボリュームが見つかりません</value>
   </data>
   <data name="XEN_VSS_REQ_ERROR_PREPARING_WRITERS" xml:space="preserve">
     <value>スナップショットの VSS ライタの準備に失敗しました。</value>
   </data>
   <data name="XEN_VSS_REQ_ERROR_PROV_NOT_LOADED" xml:space="preserve">
-    <value>Vss Provider が読み込まれていません</value>
+    <value>VSS Provider が読み込まれていません</value>
   </data>
   <data name="XEN_VSS_REQ_ERROR_START_SNAPSHOT_SET_FAILED" xml:space="preserve">
     <value>新規 VSS スナップショットの開始に失敗しました。</value>
diff --git a/XenModel/XenAPI/FriendlyErrorNames.resx b/XenModel/XenAPI/FriendlyErrorNames.resx
index ad4fa2bbd..39b3a0979 100755
--- a/XenModel/XenAPI/FriendlyErrorNames.resx
+++ b/XenModel/XenAPI/FriendlyErrorNames.resx
@@ -847,16 +847,16 @@
     <value>The Tools ISO must be ejected from all running VMs in the pool.</value>
   </data>
   <data name="PATCH_PRECHECK_FAILED_OUT_OF_SPACE" xml:space="preserve">
-    <value>The patch precheck stage failed: the server does not have enough space.</value>
+    <value>The patch pre-check stage failed: the server does not have enough space.</value>
   </data>
   <data name="PATCH_PRECHECK_FAILED_PREREQUISITE_MISSING" xml:space="preserve">
-    <value>The update precheck stage failed: prerequisite updates are missing.</value>
+    <value>The update pre-check stage failed: prerequisite updates are missing.</value>
   </data>
   <data name="PATCH_PRECHECK_FAILED_UNKNOWN_ERROR" xml:space="preserve">
-    <value>The update precheck stage failed with an unknown error.</value>
+    <value>The update pre-check stage failed with an unknown error.</value>
   </data>
   <data name="PATCH_PRECHECK_FAILED_VM_RUNNING" xml:space="preserve">
-    <value>The update precheck stage failed: there are one or more VMs still running on the server.  All VMs must be shut down or suspended before the update can be applied.</value>
+    <value>The update pre-check stage failed: there are one or more VMs still running on the server.  All VMs must be shut down or suspended before the update can be applied.</value>
   </data>
   <data name="PATCH_PRECHECK_FAILED_WRONG_SERVER_BUILD" xml:space="preserve">
     <value>The current build number ({1}) is incompatible with the update build number ({2}).</value>
@@ -1656,13 +1656,13 @@ Authorized Roles: {1}</value>
     <value>The attempt to discover the iSCSI target/device failed</value>
   </data>
   <data name="SR_BACKEND_FAILURE_84" xml:space="preserve">
-    <value>The iScsi target and received IQNs do not match</value>
+    <value>The iSCSI target and received IQNs do not match</value>
   </data>
   <data name="SR_BACKEND_FAILURE_85" xml:space="preserve">
     <value>The attempt to detach the iSCSI failed</value>
   </data>
   <data name="SR_BACKEND_FAILURE_86" xml:space="preserve">
-    <value>The attempt to query the iSCSi daemon failed</value>
+    <value>The attempt to query the iSCSI daemon failed</value>
   </data>
   <data name="SR_BACKEND_FAILURE_87" xml:space="preserve">
     <value>Either LUNid or LUNserial value must be provided</value>
@@ -1773,7 +1773,7 @@ Authorized Roles: {1}</value>
     <value>Retrieving system status from the server failed.</value>
   </data>
   <data name="TASK_CANCELLED" xml:space="preserve">
-    <value>The request was asynchronously cancelled.</value>
+    <value>The request was asynchronously canceled.</value>
   </data>
   <data name="TLS_CONNECTION_FAILED" xml:space="preserve">
     <value>Cannot contact the other host using TLS on the specified address and port</value>
@@ -1818,22 +1818,22 @@ Authorized Roles: {1}</value>
     <value>The update cannot be applied for the following host(s).</value>
   </data>
   <data name="UPDATE_PRECHECK_FAILED_CONFLICT_PRESENT" xml:space="preserve">
-    <value>The update precheck stage failed: conflicting update(s) are present.</value>
+    <value>The update pre-check stage failed: conflicting update(s) are present.</value>
   </data>
   <data name="UPDATE_PRECHECK_FAILED_GPGKEY_NOT_IMPORTED" xml:space="preserve">
-    <value>The update precheck stage failed: RPM package validation requires a GPG key that is not present on the host.</value>
+    <value>The update pre-check stage failed: RPM package validation requires a GPG key that is not present on the host.</value>
   </data>
   <data name="UPDATE_PRECHECK_FAILED_OUT_OF_SPACE" xml:space="preserve">
-    <value>The update precheck stage failed: the server does not have enough space.</value>
+    <value>The update pre-check stage failed: the server does not have enough space.</value>
   </data>
   <data name="UPDATE_PRECHECK_FAILED_PREREQUISITE_MISSING" xml:space="preserve">
-    <value>The update precheck stage failed: prerequisite update(s) are missing.</value>
+    <value>The update pre-check stage failed: prerequisite update(s) are missing.</value>
   </data>
   <data name="UPDATE_PRECHECK_FAILED_UNKNOWN_ERROR" xml:space="preserve">
-    <value>The update precheck stage failed with an unknown error.</value>
+    <value>The update pre-check stage failed with an unknown error.</value>
   </data>
   <data name="UPDATE_PRECHECK_FAILED_WRONG_SERVER_VERSION" xml:space="preserve">
-    <value>The update precheck stage failed: the server is of an incorrect version.</value>
+    <value>The update pre-check stage failed: the server is of an incorrect version.</value>
   </data>
   <data name="USB_ALREADY_ATTACHED" xml:space="preserve">
     <value>The USB device is currently attached to a VM.</value>
@@ -2094,7 +2094,7 @@ Authorized Roles: {1}</value>
     <value>The operation attempted is not valid for templates</value>
   </data>
   <data name="VM_IS_USING_NESTED_VIRT" xml:space="preserve">
-    <value>This operation is illegal because the VM is using nested virtualisation.</value>
+    <value>This operation is illegal because the VM is using nested virtualization.</value>
   </data>
   <data name="VM_LACKS_FEATURE" xml:space="preserve">
     <value>You attempted an operation on a VM which lacks the feature.</value>
@@ -2127,7 +2127,7 @@ Authorized Roles: {1}</value>
     <value>The specified VM is not currently resident on the specified server.</value>
   </data>
   <data name="VM_NO_CRASHDUMP_SR" xml:space="preserve">
-    <value>This VM does not have a crashdump SR specified.</value>
+    <value>This VM does not have a crash dump SR specified.</value>
   </data>
   <data name="VM_NO_EMPTY_CD_VBD" xml:space="preserve">
     <value>The VM has no empty CD drive (VBD).</value>
@@ -2241,7 +2241,7 @@ Authorized Roles: {1}</value>
     <value>The configured WLB server name failed to resolve in DNS.</value>
   </data>
   <data name="WLB_URL_INVALID" xml:space="preserve">
-    <value>The WLB URL is invalid. Ensure it is in format: &lt;ipaddress&gt;:&lt;port&gt;. The configured/given URL is returned.</value>
+    <value>The WLB URL is invalid. Ensure it is in the format: &lt;ipaddress&gt;:&lt;port&gt;. The configured/given URL is returned.</value>
   </data>
   <data name="WLB_XENSERVER_AUTHENTICATION_FAILED" xml:space="preserve">
     <value>WLB reported that the server rejected its configured authentication details.</value>
@@ -2280,13 +2280,13 @@ Authorized Roles: {1}</value>
     <value>Initialization of the VSS requester failed</value>
   </data>
   <data name="XEN_VSS_REQ_ERROR_NO_VOLUMES_SUPPORTED" xml:space="preserve">
-    <value>Could not find any volumes supported by the Vss Provider</value>
+    <value>Could not find any volumes supported by the VSS Provider</value>
   </data>
   <data name="XEN_VSS_REQ_ERROR_PREPARING_WRITERS" xml:space="preserve">
     <value>An attempt to prepare VSS writers for the snapshot failed</value>
   </data>
   <data name="XEN_VSS_REQ_ERROR_PROV_NOT_LOADED" xml:space="preserve">
-    <value>The Vss Provider is not loaded</value>
+    <value>The VSS Provider is not loaded</value>
   </data>
   <data name="XEN_VSS_REQ_ERROR_START_SNAPSHOT_SET_FAILED" xml:space="preserve">
     <value>An attempt to start a new VSS snapshot failed</value>
diff --git a/XenModel/XenAPI/FriendlyErrorNames.zh-CN.resx b/XenModel/XenAPI/FriendlyErrorNames.zh-CN.resx
index 19c16a150..34ad96a8d 100644
--- a/XenModel/XenAPI/FriendlyErrorNames.zh-CN.resx
+++ b/XenModel/XenAPI/FriendlyErrorNames.zh-CN.resx
@@ -1656,13 +1656,13 @@
     <value>尝试检测 iSCSI 目标/设备失败</value>
   </data>
   <data name="SR_BACKEND_FAILURE_84" xml:space="preserve">
-    <value>iScsi 目标与收到的 IQN 不匹配</value>
+    <value>iSCSI 目标与收到的 IQN 不匹配</value>
   </data>
   <data name="SR_BACKEND_FAILURE_85" xml:space="preserve">
     <value>尝试分离 iSCSI 失败</value>
   </data>
   <data name="SR_BACKEND_FAILURE_86" xml:space="preserve">
-    <value>尝试查询 iSCSi 守护程序失败</value>
+    <value>尝试查询 iSCSI 守护程序失败</value>
   </data>
   <data name="SR_BACKEND_FAILURE_87" xml:space="preserve">
     <value>必须提供 LUNid 或 LUNserial 值</value>
@@ -2241,7 +2241,7 @@
     <value>配置的 WLB 服务器名称无法在 DNS 中解析。</value>
   </data>
   <data name="WLB_URL_INVALID" xml:space="preserve">
-    <value>WLB URL 无效。请确保其格式为: &lt;ipaddress&gt;:&lt;port&gt;。将返回配置的/指定的 URL。</value>
+    <value>WLB URL 无效。请确保其格式为: &lt;IP address&gt;:&lt;port&gt;。将返回配置的/指定的 URL。</value>
   </data>
   <data name="WLB_XENSERVER_AUTHENTICATION_FAILED" xml:space="preserve">
     <value>WLB 报告服务器拒绝了所配置的身份验证详细信息。</value>
diff --git a/XenOvfTransport/Messages.Designer.cs b/XenOvfTransport/Messages.Designer.cs
index e335b0330..69ac0bc6b 100644
--- a/XenOvfTransport/Messages.Designer.cs
+++ b/XenOvfTransport/Messages.Designer.cs
@@ -19,7 +19,7 @@ namespace XenOvfTransport {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Messages {
@@ -385,7 +385,7 @@ namespace XenOvfTransport {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cancelled transfer of virtual disk {0}..
+        ///   Looks up a localized string similar to Canceled transfer of virtual disk {0}..
         /// </summary>
         internal static string ISCSI_COPY_CANCELLED {
             get {
@@ -457,7 +457,7 @@ namespace XenOvfTransport {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cancelled virtual disk verification after export..
+        ///   Looks up a localized string similar to Canceled virtual disk verification after export..
         /// </summary>
         internal static string ISCSI_VERIFY_CANCELLED {
             get {
@@ -538,7 +538,7 @@ namespace XenOvfTransport {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Configuring virtual machine for [XenServer] ... .
+        ///   Looks up a localized string similar to Configuring virtual machine for the server ... .
         /// </summary>
         internal static string START_POST_INSTALL_INSTRUCTIONS {
             get {
diff --git a/XenOvfTransport/Messages.resx b/XenOvfTransport/Messages.resx
index b0db75649..009dd5352 100644
--- a/XenOvfTransport/Messages.resx
+++ b/XenOvfTransport/Messages.resx
@@ -226,7 +226,7 @@
     <value>Import: </value>
   </data>
   <data name="ISCSI_COPY_CANCELLED" xml:space="preserve">
-    <value>Cancelled transfer of virtual disk {0}.</value>
+    <value>Canceled transfer of virtual disk {0}.</value>
   </data>
   <data name="ISCSI_COPY_ERROR" xml:space="preserve">
     <value>Failed to transfer virtual disk {0}.</value>
@@ -250,7 +250,7 @@
     <value>Failed to start Transfer VM.</value>
   </data>
   <data name="ISCSI_VERIFY_CANCELLED" xml:space="preserve">
-    <value>Cancelled virtual disk verification after export.</value>
+    <value>Canceled virtual disk verification after export.</value>
   </data>
   <data name="ISCSI_VERIFY_ERROR" xml:space="preserve">
     <value>Failed to verify virtual disk {0}.</value>