diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/i18n/ToolMessages.properties b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/i18n/ToolMessages.properties
index ea4ef7d35e..a7740c0a9d 100644
--- a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/i18n/ToolMessages.properties
+++ b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/i18n/ToolMessages.properties
@@ -10,7 +10,7 @@ fcli.tool.install.platform = By default, fcli will try to install tool binaries
   platforms.
 fcli.tool.install.version = Tool version to install; see output of list command to view available versions. \
   Default value: ${DEFAULT-VALUE} 
-fcli.tool.install.install-dir = Tool installation directory. Deprecated, use --tools-dir instead.
+fcli.tool.install.install-dir = Tool installation directory. Deprecated, use --base-dir instead.
 fcli.tool.install.base-dir = Directory under which the tool will be installed. Defaults to ~/fortify. \
   Tools will be installed to <base-dir>/<tool>/<version>.
 fcli.tool.install.on-digest-mismatch = Action to take if there is a digest mismatch. Allowed values: \
@@ -90,7 +90,7 @@ fcli.tool.bugtracker-utility.install.usage.header = Download and install Fortify
 fcli.tool.bugtracker-utility.install.usage.description = ${fcli.tool.install.generic-description}
 fcli.tool.bugtracker-utility.install.confirm = Automatically confirm all prompts (cleaning the target directory, uninstalling other versions).
 fcli.tool.bugtracker-utility.list.usage.header = List available and installed FortifyBugTrackerUtility versions.
-fcli.tool.bugtracker-utility.list.usage.description = Use the 'fcli tool config update' command to update the list of available versions.
+fcli.tool.bugtracker-utility.list.usage.description = Use the 'fcli tool definitions update' command to update the list of available versions.
 fcli.tool.bugtracker-utility.list-platforms.usage.header = List available platforms for FortifyBugTrackerUtility
 fcli.tool.bugtracker-utility.uninstall.usage.header = Uninstall FortifyBugTrackerUtility.
 fcli.tool.bugtracker-utility.uninstall.usage.description = This command removes one or more FortifyBugTrackerUtility installations that were previously installed using the 'fcli tool bugtracker-utility install' command. ${fcli.tool.uninstall.generic-global-bin-description} 
@@ -102,7 +102,7 @@ fcli.tool.debricked-cli.install.usage.header = Download and install the Debricke
 fcli.tool.debricked-cli.install.usage.description = ${fcli.tool.install.generic-description}
 fcli.tool.debricked-cli.install.confirm = Automatically confirm all prompts (cleaning the target directory, uninstalling other versions).
 fcli.tool.debricked-cli.list.usage.header = List available and installed Debricked CLI versions.
-fcli.tool.debricked-cli.list.usage.description = Use the 'fcli tool config update' command to update the list of available versions.
+fcli.tool.debricked-cli.list.usage.description = Use the 'fcli tool definitions update' command to update the list of available versions.
 fcli.tool.debricked-cli.list-platforms.usage.header = List available platforms for Debricked CLI
 fcli.tool.debricked-cli.uninstall.usage.header = Uninstall Debricked CLI.
 fcli.tool.debricked-cli.uninstall.usage.description = This command removes one or more Debricked CLI installations that were previously installed using the 'fcli tool debricked install' command. ${fcli.tool.uninstall.generic-global-bin-description}
@@ -114,7 +114,7 @@ fcli.tool.fcli.install.usage.header = Download and install fcli.
 fcli.tool.fcli.install.usage.description = ${fcli.tool.install.generic-description}
 fcli.tool.fcli.install.confirm = Automatically confirm all prompts (cleaning the target directory, uninstalling other versions).
 fcli.tool.fcli.list.usage.header = List available and installed fcli versions.
-fcli.tool.fcli.list.usage.description = Use the 'fcli tool config update' command to update the list of available versions.
+fcli.tool.fcli.list.usage.description = Use the 'fcli tool definitions update' command to update the list of available versions.
 fcli.tool.fcli.list-platforms.usage.header = List available platforms for fcli.
 fcli.tool.fcli.uninstall.usage.header = Uninstall fcli.
 fcli.tool.fcli.uninstall.usage.description = This command removes one or more fcli installations that were previously installed using the 'fcli tool fcli install' command. ${fcli.tool.uninstall.generic-global-bin-description}
@@ -126,7 +126,7 @@ fcli.tool.fod-uploader.install.usage.header = Download and install Fortify on De
 fcli.tool.fod-uploader.install.usage.description = ${fcli.tool.install.generic-description}
 fcli.tool.fod-uploader.install.confirm = Automatically confirm all prompts (cleaning the target directory, uninstalling other versions).
 fcli.tool.fod-uploader.list.usage.header = List available and installed FoD Uploader versions.
-fcli.tool.fod-uploader.list.usage.description = Use the 'fcli tool config update' command to update the list of available versions.
+fcli.tool.fod-uploader.list.usage.description = Use the 'fcli tool definitions update' command to update the list of available versions.
 fcli.tool.fod-uploader.list-platforms.usage.header = List available platforms for FoD Uploader.
 fcli.tool.fod-uploader.uninstall.usage.header = Uninstall Fortify on Demand Uploader.
 fcli.tool.fod-uploader.uninstall.usage.description = This command removes one or more Fortify on Demand Uploader installations that were previously installed using the 'fcli tool fod-uploader install' command. ${fcli.tool.uninstall.generic-global-bin-description} 
@@ -139,7 +139,7 @@ fcli.tool.sc-client.install.usage.description = ${fcli.tool.install.generic-desc
 fcli.tool.sc-client.install.confirm = Automatically confirm all prompts (cleaning the target directory, uninstalling other versions).
 fcli.tool.sc-client.install.client-auth-token = ScanCentral SAST client_auth_token used for authenticating with ScanCentral SAST Controller.
 fcli.tool.sc-client.list.usage.header = List available and installed ScanCentral SAST Client versions.
-fcli.tool.sc-client.list.usage.description = Use the 'fcli tool config update' command to update the list of available versions.
+fcli.tool.sc-client.list.usage.description = Use the 'fcli tool definitions update' command to update the list of available versions.
 fcli.tool.sc-client.list-platforms.usage.header = List available platforms for ScanCentral SAST Client.
 fcli.tool.sc-client.uninstall.usage.header = Uninstall ScanCentral SAST Client.
 fcli.tool.sc-client.uninstall.usage.description = This command removes one or more ScanCentral Client installations that were previously installed using the 'fcli tool sc-client install' command. ${fcli.tool.uninstall.generic-global-bin-description}
@@ -151,7 +151,7 @@ fcli.tool.vuln-exporter.install.usage.header = Download and install Fortify Vuln
 fcli.tool.vuln-exporter.install.usage.description = ${fcli.tool.install.generic-description}
 fcli.tool.vuln-exporter.install.confirm = Automatically confirm all prompts (cleaning the target directory, uninstalling other versions).
 fcli.tool.vuln-exporter.list.usage.header = List available and installed Fortify Vulnerability Exporter versions.
-fcli.tool.vuln-exporter.list.usage.description = Use the 'fcli tool config update' command to update the list of available versions.
+fcli.tool.vuln-exporter.list.usage.description = Use the 'fcli tool definitions update' command to update the list of available versions.
 fcli.tool.vuln-exporter.list-platforms.usage.header = List available platforms for Fortify Vulnerability Exporter.
 fcli.tool.vuln-exporter.uninstall.usage.header = Uninstall Fortify Vulnerability Exporter.
 fcli.tool.sc-client.uninstall.usage.description = This command removes one or more Fortify Vulnerability Exporter installations that were previously installed using the 'fcli tool vuln-exporter install' command. ${fcli.tool.uninstall.generic-global-bin-description}