diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/checkout_renewals.inc
similarity index 75%
rename from koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal.inc
rename to koha-tmpl/intranet-tmpl/prog/en/includes/modals/checkout_renewals.inc
index baeb67d9d8..1748ac59b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/checkout_renewals.inc
@@ -1,18 +1,19 @@
+<!-- Checkout renewals modal -->
 <div id="checkoutRenewals" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="checkoutRenewalsLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
                 <h3 id="checkoutRenewalsLabel"> Item renewals</h3>
-            </div>
+            </div> <!-- /.modal-header -->
             <div class="modal-body">
                 <div id="retrieving" class="alert" style="display:none">Retrieving renewals...</div>
                 <div id="incomplete" class="alert" style="display:none"></div>
                 <ul id="results" style="display:none"></ul>
-            </div>
+            </div> <!-- /.modal-body -->
             <div class="modal-footer">
                 <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
-            </div>
-        </div>
-    </div>
-</div>
+            </div> <!-- /.modal-footer -->
+        </div> <!-- /.modal-content -->
+    </div> <!-- /.modal-dialog -->
+</div> <!-- /#checkoutRenewals -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/str/checkout_renewals.inc
similarity index 78%
rename from koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal-strings.inc
rename to koha-tmpl/intranet-tmpl/prog/en/includes/str/checkout_renewals.inc
index dde6014c0d..a8dfcde80b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkout-renewal-modal-strings.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/str/checkout_renewals.inc
@@ -1,3 +1,4 @@
+<!-- str/checkout_renewals.inc -->
 <script>
     var renewed_prop = _("Note: %s out of %s renewals have been logged");
     var renewed = _("Renewed by");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index cdb239e740..3bb6dc5b51 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -376,13 +376,13 @@
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'catalog-strings.inc' %]
-    [% INCLUDE 'checkout-renewal-modal.inc' %]
-    [% INCLUDE 'checkout-renewal-modal-strings.inc' %]
+    [% INCLUDE 'modals/checkout_renewals.inc' %]
+    [% INCLUDE 'str/checkout_renewals.inc' %]
     [% INCLUDE 'js-date-format.inc' %]
     [% INCLUDE 'js-patron-format.inc' %]
     [% Asset.js("js/catalog.js") | $raw %]
     [% Asset.js("js/browser.js") | $raw %]
-    [% Asset.js("js/checkout-renewal-modal.js") | $raw %]
+    [% Asset.js("js/checkout_renewals_modal.js") | $raw %]
     <script>
         var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10));
         browser.show();
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
index 5901b2a7bc..f3121647bd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
@@ -159,11 +159,11 @@
     [% Asset.js("js/members-menu.js") | $raw %]
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'columns_settings.inc' %]
-    [% INCLUDE 'checkout-renewal-modal.inc' %]
-    [% INCLUDE 'checkout-renewal-modal-strings.inc' %]
+    [% INCLUDE 'modals/checkout_renewals.inc' %]
+    [% INCLUDE 'str/checkout_renewals.inc' %]
     [% INCLUDE 'js-date-format.inc' %]
     [% INCLUDE 'js-patron-format.inc' %]
-    [% Asset.js("js/checkout-renewal-modal.js") | $raw %]
+    [% Asset.js("js/checkout_renewals_modal.js") | $raw %]
     <script id="js">
         $(document).ready(function() {
             var table_settings = [% TablesSettings.GetTableSettings('members', 'checkouthistory', 'checkouthistory-table', 'json') | $raw %];
diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkout-renewal-modal.js b/koha-tmpl/intranet-tmpl/prog/js/checkout_renewals_modal.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/js/checkout-renewal-modal.js
rename to koha-tmpl/intranet-tmpl/prog/js/checkout_renewals_modal.js