diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html-customization-help.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html-customization-help.inc
index bc0bfabe7c..b6febe7999 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html-customization-help.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html-customization-help.inc
@@ -52,9 +52,9 @@
 
 <div id="RoutingListNote" class="hint customization_note"> Include the following note on all routing list slips. </div>
 
-<div id="SCOMainUserBlock_notes" class="hint customization_note"> Show this content on the web-based self checkout screen. </div>
+<div id="SCOMainUserBlock_notes" class="hint customization_note"> Show this content on the web-based self-checkout screen. </div>
 
-<div id="SelfCheckHelpMessage_notes" class="hint customization_note"> Show this content on the Help page of the web-based self checkout system. </div>
+<div id="SelfCheckHelpMessage_notes" class="hint customization_note"> Show this content on the Help page of the web-based self-checkout system. </div>
 
 <div id="SelfCheckInMainUserBlock_notes" class="hint customization_note"> Show this content on the self check-in screen. </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
index a0e17a2d41..64304081eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
@@ -567,7 +567,7 @@
         <span class="sub_permission self_checkin_module_subpermission"> Log into the self check-in module. Note: this permission prevents the patron from using any other OPAC functionality </span>
         <span class="permissioncode">([% name | html %])</span>
     [%- CASE 'self_checkout_module' -%]
-        <span class="sub_permission self_checkout_module_subpermission"> Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID </span>
+        <span class="sub_permission self_checkout_module_subpermission"> Perform self-checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID </span>
         <span class="permissioncode">([% name | html %])</span>
     [%- CASE 'manage_rota_items' -%]
         <span class="sub_permission manage_rota_items_subpermission"> Add and remove items from rotas </span>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 8dc8ecbe88..36ce2fbe4f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -571,13 +571,13 @@
                     [% IF AutoSelfCheckPatronDoesNotHaveSelfCheckPerm %]
                         <tr>
                             <th scope="row"><strong>Warning</strong> </th>
-                            <td> The patron used for the self checkout module at the OPAC does not have the self_check => self_checkout_module permission. </td>
+                            <td> The patron used for the self-checkout module at the OPAC does not have the self_check => self_checkout_module permission. </td>
                         </tr>
                     [% END %]
                     [% IF AutoSelfCheckPatronHasTooManyPerm %]
                         <tr>
                             <th scope="row"><strong>Warning</strong> </th>
-                            <td> The patron used for the self checkout module at the OPAC has too many permissions. They should only have self_check => self_checkout_module. </td>
+                            <td> The patron used for the self-checkout module at the OPAC has too many permissions. They should only have self_check => self_checkout_module. </td>
                         </tr>
                     [% END %]
                     [% IF warnNoTemplateCaching %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index 9719f3c87e..3d60150099 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -236,7 +236,7 @@ Circulation:
                   0: "Don't allow"
             - checkouts of items reserved to someone else via SIP checkout messages.
             - If allowed do not generate RESERVED warning.
-            - This allows self checkouts for those items. If using the holds queue items with pending holds will be marked as "unavailable" if this set to "Don't allow".
+            - This allows self-checkouts for those items. If using the holds queue items with pending holds will be marked as "unavailable" if this set to "Don't allow".
         -
             - pref: AllowItemsOnLoanCheckoutSIP
               choices:
@@ -244,19 +244,19 @@ Circulation:
                   0: "Don't allow"
             - checkouts of items already checked out to someone else via SIP checkout messages.
             - If allowed do not generate ISSUED_TO_ANOTHER warning.
-            - This allows self checkouts for those items.
+            - This allows self-checkouts for those items.
         -
             - pref: AllowItemsOnHoldCheckoutSCO
               choices:
                   1: Allow
                   0: "Don't allow"
-            - checkouts of items reserved to someone else in the SCO module. If allowed do not generate RESERVE_WAITING and RESERVED warning. This allows self checkouts for those items.
+            - checkouts of items reserved to someone else in the SCO module. If allowed do not generate RESERVE_WAITING and RESERVED warning. This allows self-checkouts for those items.
         -
             - pref: AllFinesNeedOverride
               choices:
                   1: Require
                   0: "Don't require"
-            - staff to manually override all fines, even fines less than set in the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=noissuescharge">noissuescharge</a> system preference. Enabling this system preference will block all checkouts for patrons with fines both via the web-based self checkout system and via SIP.
+            - staff to manually override all fines, even fines less than set in the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=noissuescharge">noissuescharge</a> system preference. Enabling this system preference will block all checkouts for patrons with fines both via the web-based self-checkout system and via SIP.
         -
             - pref: AllowFineOverride
               choices:
@@ -1247,13 +1247,13 @@ Circulation:
               class: code
     Self check-out module:
         -
-            - "Include the following JavaScript on all pages in the web-based self checkout:"
+            - "Include the following JavaScript on all pages in the web-based self-checkout:"
             - pref: SCOUserJS
               type: textarea
               syntax: javascript
               class: code
         -
-            - "Include the following CSS on all pages in the web-based self checkout:"
+            - "Include the following CSS on all pages in the web-based self-checkout:"
             - pref: SCOUserCSS
               type: textarea
               syntax: css
@@ -1263,28 +1263,28 @@ Circulation:
               choices:
                   1: Show
                   0: "Don't show"
-            - "the patron's list of current checkouts by default when they log in to the self checkout module."
+            - "the patron's list of current checkouts by default when they log in to the self-checkout module."
         -
             - pref: ShowPatronImageInWebBasedSelfCheck
               choices:
                   1: Show
                   0: "Don't show"
-            - "the patron's picture (if one has been added) when they use the web-based self checkout."
+            - "the patron's picture (if one has been added) when they use the web-based self-checkout."
         -
             - pref: WebBasedSelfCheck
               choices:
                   1: Enable
                   0: "Don't enable"
-            - "the web-based self checkout system (available at: /cgi-bin/koha/sco/sco-main.pl)."
+            - "the web-based self-checkout system (available at: /cgi-bin/koha/sco/sco-main.pl)."
         -
-            - Have patrons log into the web-based self checkout system with their
+            - Have patrons log into the web-based self-checkout system with their
             - pref: SelfCheckoutByLogin
               choices:
                   1: username and password
                   0: cardnumber
             - ".</br>NOTE: If using 'cardnumber' and AutoSelfCheckAllowed you should set SelfCheckAllowByIPRanges to prevent brute force attacks to gain patron information outside the library."
         -
-            - "Time out the current patron's web-based self checkout system login after"
+            - "Time out the current patron's web-based self-checkout system login after"
             - pref: SelfCheckTimeout
               class: integer
             - seconds.
@@ -1293,13 +1293,13 @@ Circulation:
               choices:
                   1: Allow
                   0: "Don't allow"
-            - patrons to return items through web-based self checkout system. 
+            - patrons to return items through web-based self-checkout system.
         -
             - pref: AutoSelfCheckAllowed
               choices:
                   1: Allow
                   0: "Don't allow"
-            - "the web-based self checkout system to automatically log in with this staff login"
+            - "the web-based self-checkout system to automatically log in with this staff login"
             - pref: AutoSelfCheckID
             - and this password
             - pref: AutoSelfCheckPass
@@ -1311,14 +1311,14 @@ Circulation:
               choices:
                   1: Show
                   0: "Don't show"
-            - "the print receipt popup dialog when self checkout is finished."
+            - "the print receipt popup dialog when self-checkout is finished."
         -
             - "Allow access to the self check from the following IP addresses:"
             - pref: SelfCheckAllowByIPRanges
               class: short
             - (Leave blank if not used. Use ranges or simple IP addresses separated by spaces, like <code>192.168.1.1 192.168.0.0/24</code>.)
         -
-            - "Patron categories allowed to check out in a batch while logged into the self checkout system:"
+            - "Patron categories allowed to check out in a batch while logged into the self-checkout system:"
             - pref: SCOBatchCheckoutsValidCategories
               choices: patron-categories
               class: multiple
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index 0a658a05e3..18e38980f2 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -112,7 +112,7 @@
                 [% IF Koha.Preference( 'OpacTrustedCheckout' ) %]
                     <li class="nav-item">
                         <a href="#" class="nav-link" title="Self check out" id="comenulink" role="button" data-bs-toggle="modal" data-bs-target="#checkoutModal">
-                            <i id="checkout-icon" class="fa fa-barcode fa-icon-black" aria-hidden="true"></i> <span class="checkout-label">Self checkout</span>
+                            <i id="checkout-icon" class="fa fa-barcode fa-icon-black" aria-hidden="true"></i> <span class="checkout-label">Self-checkout</span>
                         </a>
                     </li>
                 [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/checkout.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/checkout.inc
index 6a581178a3..4fce575fcc 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/checkout.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/checkout.inc
@@ -3,7 +3,7 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h1 class="modal-title" id="checkoutModalLabel">Self checkout</h1>
+                <h1 class="modal-title" id="checkoutModalLabel">Self-checkout</h1>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
index bbfdb49ef1..b930c847e0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
@@ -6,7 +6,7 @@
 [% PROCESS 'i18n.inc' %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% SET SelfCheckHelpMessage = AdditionalContents.get( location => "SelfCheckHelpMessage", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
-<title>Self checkout help &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha[% END %]</title>
+<title>Self-checkout help &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha[% END %]</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Koha" />
 <!-- leave this for stats -->
@@ -52,14 +52,14 @@
         <div class="container-fluid">
             <div class="row">
                 <div class="col order-first order-md-first order-lg-2">
-                    <h1>Self checkout help</h1>
+                    <h1>Self-checkout help</h1>
 
                     [% IF ( SelfCheckHelpMessage ) %]
                         <div id="selfcheckhelpmessage"> [% PROCESS koha_news_block news => SelfCheckHelpMessage %] </div>
                     [% END %]
 
                     <div id="selfcheckdefaulthelpmessage">
-                        <p>If this is your first time using the self checkout system, or if the system is not behaving as expected, you may want to refer to this guide to get yourself started.</p>
+                        <p>If this is your first time using the self-checkout system, or if the system is not behaving as expected, you may want to refer to this guide to get yourself started.</p>
 
                         <h2>Step one: Enter your user ID[% IF ( SelfCheckoutByLogin ) %]and password[% END %]</h2>
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt
index f97754a18f..3228f8d1c7 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt
@@ -2,7 +2,7 @@
 [% USE Asset %]
 [% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Print receipt for [% borrowernumber | html %] &rsaquo; Self checkout &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha[% END %]</title>
+<title>Print receipt for [% borrowernumber | html %] &rsaquo; Self-checkout &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha[% END %]</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="[% IF ( OpacFavicon  ) %][% OpacFavicon | url %][% ELSE %][% interface | html %]/[% theme | html %]/images/favicon.ico[% END %]" type="image/x-icon" />
 [% IF ( bidi ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
index 2e8d7b46c4..c6a11c06cc 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
@@ -10,7 +10,7 @@
 [% SET SCOMainUserBlock = AdditionalContents.get( location => "SCOMainUserBlock", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
 [% PROCESS 'html_helpers.inc' %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Self checkout &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha[% END %]</title>
+<title>Self-checkout &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha[% END %]</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Koha" />
 <!-- leave this for stats -->
@@ -72,7 +72,7 @@
                 <div class="container-fluid">
                     <div class="row">
                         <div class="[% main_div_class | html %]">
-                            <div id="masthead"><h1>[% LibraryName | html %] Self checkout system</h1></div>
+                            <div id="masthead"><h1>[% LibraryName | html %] Self-checkout system</h1></div>
 
                             [% PROCESS display_errors %]
 
@@ -302,7 +302,7 @@
                 <div class="container-fluid">
                     <div class="row">
                         <div class="[% main_div_class | html %]">
-                            <div id="masthead"><h1>[% LibraryName | html %] Self checkout system</h1></div>
+                            <div id="masthead"><h1>[% LibraryName | html %] Self-checkout system</h1></div>
 
                             [% PROCESS display_errors %]
 
@@ -383,7 +383,7 @@
             <div class="container-fluid">
                 <div class="row">
                     <div class="[% main_div_class | html %]">
-                        <div id="masthead"><h1>[% LibraryName | html %] Self checkout system</h1></div>
+                        <div id="masthead"><h1>[% LibraryName | html %] Self-checkout system</h1></div>
 
                         [% PROCESS display_errors %]
 
diff --git a/t/mock_templates/intranet-tmpl/prog/en/modules/about.tt b/t/mock_templates/intranet-tmpl/prog/en/modules/about.tt
index 701ae5407f..692fca861f 100644
--- a/t/mock_templates/intranet-tmpl/prog/en/modules/about.tt
+++ b/t/mock_templates/intranet-tmpl/prog/en/modules/about.tt
@@ -547,13 +547,13 @@
                         [% IF AutoSelfCheckPatronDoesNotHaveSelfCheckPerm %]
                             <tr>
                                 <th scope="row"><strong>Warning</strong> </th>
-                                <td> The patron used for the self checkout module at the OPAC does not have the self_check => self_checkout_module permission. </td>
+                                <td> The patron used for the self-checkout module at the OPAC does not have the self_check => self_checkout_module permission. </td>
                             </tr>
                         [% END %]
                         [% IF AutoSelfCheckPatronHasTooManyPerm %]
                             <tr>
                                 <th scope="row"><strong>Warning</strong> </th>
-                                <td> The patron used for the self checkout module at the OPAC has too many permissions. They should only have self_check => self_checkout_module. </td>
+                                <td> The patron used for the self-checkout module at the OPAC has too many permissions. They should only have self_check => self_checkout_module. </td>
                             </tr>
                         [% END %]
                         [% IF warnNoTemplateCaching %]
diff --git a/t/mock_templates/intranet-tmpl/prog/fr-CA/modules/about.tt b/t/mock_templates/intranet-tmpl/prog/fr-CA/modules/about.tt
index 825a99a893..6de9b8c515 100644
--- a/t/mock_templates/intranet-tmpl/prog/fr-CA/modules/about.tt
+++ b/t/mock_templates/intranet-tmpl/prog/fr-CA/modules/about.tt
@@ -547,13 +547,13 @@
                         [% IF AutoSelfCheckPatronDoesNotHaveSelfCheckPerm %]
                             <tr>
                                 <th scope="row"><strong>Warning</strong> </th>
-                                <td> The patron used for the self checkout module at the OPAC does not have the self_check => self_checkout_module permission. </td>
+                                <td> The patron used for the self-checkout module at the OPAC does not have the self_check => self_checkout_module permission. </td>
                             </tr>
                         [% END %]
                         [% IF AutoSelfCheckPatronHasTooManyPerm %]
                             <tr>
                                 <th scope="row"><strong>Warning</strong> </th>
-                                <td> The patron used for the self checkout module at the OPAC has too many permissions. They should only have self_check => self_checkout_module. </td>
+                                <td> The patron used for the self-checkout module at the OPAC has too many permissions. They should only have self_check => self_checkout_module. </td>
                             </tr>
                         [% END %]
                         [% IF warnNoTemplateCaching %]