diff --git a/administrator/components/com_contenthistory/tmpl/history/modal.php b/administrator/components/com_contenthistory/tmpl/history/modal.php
index 10a98ea2c238d..8f141f33a8784 100644
--- a/administrator/components/com_contenthistory/tmpl/history/modal.php
+++ b/administrator/components/com_contenthistory/tmpl/history/modal.php
@@ -21,8 +21,8 @@
 $hash           = $this->state->get('sha1_hash');
 $formUrl        = 'index.php?option=com_contenthistory&view=history&layout=modal&tmpl=component&item_id=' . $this->state->get('item_id') . '&' . Session::getFormToken() . '=1';
 
-Text::script('COM_CONTENTHISTORY_BUTTON_SELECT_ONE', true);
-Text::script('COM_CONTENTHISTORY_BUTTON_SELECT_TWO', true);
+Text::script('COM_CONTENTHISTORY_BUTTON_SELECT_ONE_VERSION', true);
+Text::script('COM_CONTENTHISTORY_BUTTON_SELECT_TWO_VERSIONS', true);
 Text::script('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
diff --git a/administrator/language/en-GB/com_contenthistory.ini b/administrator/language/en-GB/com_contenthistory.ini
index ae053ff4691c2..22808be9a0244 100644
--- a/administrator/language/en-GB/com_contenthistory.ini
+++ b/administrator/language/en-GB/com_contenthistory.ini
@@ -13,8 +13,8 @@ COM_CONTENTHISTORY_BUTTON_LOAD="Restore"
 COM_CONTENTHISTORY_BUTTON_LOAD_DESC="This button loads the selected version into the edit form."
 COM_CONTENTHISTORY_BUTTON_PREVIEW="Preview"
 COM_CONTENTHISTORY_BUTTON_PREVIEW_DESC="This button allows you to see a preview of the selected version."
-COM_CONTENTHISTORY_BUTTON_SELECT_ONE="Please select one version."
-COM_CONTENTHISTORY_BUTTON_SELECT_TWO="Please select two versions."
+COM_CONTENTHISTORY_BUTTON_SELECT_ONE_VERSION="Please select one version."
+COM_CONTENTHISTORY_BUTTON_SELECT_TWO_VERSIONS="Please select two versions."
 COM_CONTENTHISTORY_CHARACTER_COUNT="Character Count"
 COM_CONTENTHISTORY_COMPARE_CAPTION="Table comparing two versions."
 COM_CONTENTHISTORY_COMPARE_DIFF="Changes"
diff --git a/build/media_source/com_contenthistory/js/admin-history-modal.es6.js b/build/media_source/com_contenthistory/js/admin-history-modal.es6.js
index 7fa622d47636a..335f510c7c508 100644
--- a/build/media_source/com_contenthistory/js/admin-history-modal.es6.js
+++ b/build/media_source/com_contenthistory/js/admin-history-modal.es6.js
@@ -20,7 +20,7 @@
         }
       } else {
         // @todo use the CE Modal here
-        alert(Joomla.Text._('COM_CONTENTHISTORY_BUTTON_SELECT_ONE'));
+        alert(Joomla.Text._('COM_CONTENTHISTORY_BUTTON_SELECT_ONE_VERSION'));
       }
       return false;
     });
@@ -36,7 +36,7 @@
         }
       } else {
         // @todo use the CE Modal here
-        alert(Joomla.Text._('COM_CONTENTHISTORY_BUTTON_SELECT_ONE'));
+        alert(Joomla.Text._('COM_CONTENTHISTORY_BUTTON_SELECT_ONE_VERSION'));
       }
       return false;
     });
@@ -55,7 +55,7 @@
         }
       } else {
         // @todo use the CE Modal here
-        alert(Joomla.Text._('COM_CONTENTHISTORY_BUTTON_SELECT_TWO'));
+        alert(Joomla.Text._('COM_CONTENTHISTORY_BUTTON_SELECT_TWO_VERSIONS'));
       }
       return false;
     });
diff --git a/language/en-GB/mod_tags_similar.ini b/language/en-GB/mod_tags_similar.ini
index 276865b083d3a..d799d4de975cf 100644
--- a/language/en-GB/mod_tags_similar.ini
+++ b/language/en-GB/mod_tags_similar.ini
@@ -8,7 +8,7 @@ MOD_TAGS_SIMILAR_FIELD_ALL="All"
 MOD_TAGS_SIMILAR_FIELD_HALF="Half"
 MOD_TAGS_SIMILAR_FIELD_MATCHTYPE_DESC="How closely an item's tags need to match. All - requires that all tags in the displayed item be matched. Any - requires that at least one tag match. Half - requires that at least half of the tags match (rounded up in the case of decimals)."
 MOD_TAGS_SIMILAR_FIELD_MATCHTYPE_LABEL="Match Type"
-MOD_TAGS_SIMILAR_FIELD_ONE="Any"
+MOD_TAGS_SIMILAR_FIELD_ONE_TAG="Any"
 MOD_TAGS_SIMILAR_FIELD_ORDERING_COUNT="Number of matching tags"
 MOD_TAGS_SIMILAR_FIELD_ORDERING_COUNT_AND_RANDOM="Number of matching tags & Random"
 MOD_TAGS_SIMILAR_FIELD_ORDERING_LABEL="Order Results"
diff --git a/modules/mod_tags_similar/mod_tags_similar.xml b/modules/mod_tags_similar/mod_tags_similar.xml
index 0689874f2bdae..3551db24ece7b 100644
--- a/modules/mod_tags_similar/mod_tags_similar.xml
+++ b/modules/mod_tags_similar/mod_tags_similar.xml
@@ -43,7 +43,7 @@
 					validate="options"
 					>
 					<option value="all">MOD_TAGS_SIMILAR_FIELD_ALL</option>
-					<option value="any">MOD_TAGS_SIMILAR_FIELD_ONE</option>
+					<option value="any">MOD_TAGS_SIMILAR_FIELD_ONE_TAG</option>
 					<option value="half">MOD_TAGS_SIMILAR_FIELD_HALF</option>
 				</field>