From 69fd7c026d6a5ed1e3db2c18c591b367f62bc089 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 12 Dec 2023 11:21:07 +0100
Subject: [PATCH] Bug 34478: op =~ ^cud- everywhere

This is the result of
  perl op_must_start_with_cud.pl

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/includes/acquisitions-toolbar.inc |  2 +-
 .../prog/en/includes/checkouts-table.inc      |  2 +-
 .../prog/en/includes/circ-menu.inc            |  4 ++--
 .../modals/serials_multi_receiving.inc        |  2 +-
 .../en/includes/virtualshelves-toolbar.inc    |  2 +-
 .../prog/en/modules/acqui/addorderiso2709.tt  |  2 +-
 .../prog/en/modules/acqui/basket.tt           | 12 +++++-----
 .../prog/en/modules/acqui/basketgroup.tt      |  2 +-
 .../prog/en/modules/acqui/basketheader.tt     |  2 +-
 .../prog/en/modules/acqui/duplicate_orders.tt |  6 ++---
 .../prog/en/modules/acqui/invoice-files.tt    |  2 +-
 .../prog/en/modules/acqui/invoice.tt          |  4 ++--
 .../prog/en/modules/acqui/invoices.tt         |  2 +-
 .../prog/en/modules/acqui/lateorders.tt       |  6 ++---
 .../prog/en/modules/acqui/moddeliverydate.tt  |  2 +-
 .../prog/en/modules/acqui/modordernotes.tt    |  2 +-
 .../prog/en/modules/acqui/neworderempty.tt    |  4 ++--
 .../prog/en/modules/acqui/uncertainprice.tt   |  2 +-
 .../prog/en/modules/acqui/vendor_issues.tt    |  4 ++--
 .../prog/en/modules/acqui/z3950_search.tt     |  4 ++--
 .../en/modules/admin/additional-fields.tt     |  2 +-
 .../prog/en/modules/admin/admin-home.tt       |  2 +-
 .../en/modules/admin/adveditorshortcuts.tt    |  2 +-
 .../prog/en/modules/admin/aqbudgetperiods.tt  |  8 +++----
 .../prog/en/modules/admin/aqbudgets.tt        |  4 ++--
 .../prog/en/modules/admin/aqcontract.tt       |  4 ++--
 .../prog/en/modules/admin/aqplan.tt           |  2 +-
 .../modules/admin/auth_subfields_structure.tt |  4 ++--
 .../en/modules/admin/auth_tag_structure.tt    |  6 ++---
 .../en/modules/admin/authorised_values.tt     |  6 ++---
 .../prog/en/modules/admin/authtypes.tt        |  6 ++---
 .../prog/en/modules/admin/biblio_framework.tt |  4 ++--
 .../prog/en/modules/admin/cash_registers.tt   |  2 +-
 .../prog/en/modules/admin/categories.tt       |  4 ++--
 .../prog/en/modules/admin/cities.tt           |  4 ++--
 .../prog/en/modules/admin/classsources.tt     |  6 ++---
 .../prog/en/modules/admin/credit_types.tt     |  2 +-
 .../prog/en/modules/admin/curbside_pickup.tt  |  2 +-
 .../prog/en/modules/admin/currency.tt         |  4 ++--
 .../prog/en/modules/admin/debit_types.tt      |  2 +-
 .../prog/en/modules/admin/desks.tt            |  4 ++--
 .../prog/en/modules/admin/edi_accounts.tt     |  4 ++--
 .../prog/en/modules/admin/edi_ean_accounts.tt |  4 ++--
 .../admin/identity_provider_domains.tt        |  4 ++--
 .../en/modules/admin/identity_providers.tt    |  4 ++--
 .../en/modules/admin/ill_batch_statuses.tt    |  2 +-
 .../en/modules/admin/items_search_field.tt    |  4 ++--
 .../prog/en/modules/admin/itemtypes.tt        |  4 ++--
 .../en/modules/admin/marc-overlay-rules.tt    |  2 +-
 .../modules/admin/marc_subfields_structure.tt |  4 ++--
 .../prog/en/modules/admin/marctagstructure.tt |  6 ++---
 .../prog/en/modules/admin/matching-rules.tt   |  4 ++--
 .../prog/en/modules/admin/oai_set_mappings.tt |  2 +-
 .../prog/en/modules/admin/oai_sets.tt         |  4 ++--
 .../prog/en/modules/admin/overdrive.tt        |  2 +-
 .../en/modules/admin/patron-attr-types.tt     |  4 ++--
 .../prog/en/modules/admin/preferences.tt      |  2 +-
 .../prog/en/modules/admin/restrictions.tt     |  4 ++--
 .../searchengine/elasticsearch/mappings.tt    |  6 ++---
 .../prog/en/modules/admin/share_content.tt    |  6 ++---
 .../prog/en/modules/admin/smart-rules.tt      | 16 ++++++-------
 .../prog/en/modules/admin/sms_providers.tt    |  2 +-
 .../prog/en/modules/admin/smtp_servers.tt     |  4 ++--
 .../en/modules/admin/systempreferences.tt     |  6 ++---
 .../en/modules/admin/transport-cost-matrix.tt |  2 +-
 .../prog/en/modules/admin/usage_statistics.tt |  2 +-
 .../prog/en/modules/admin/z3950servers.tt     |  2 +-
 .../en/modules/authorities/authorities.tt     |  2 +-
 .../prog/en/modules/catalogue/itemsearch.tt   |  2 +-
 .../prog/en/modules/catalogue/moredetail.tt   | 14 +++++------
 .../en/modules/catalogue/stockrotation.tt     |  2 +-
 .../prog/en/modules/cataloguing/addbiblio.tt  |  2 +-
 .../prog/en/modules/cataloguing/additem.tt    |  2 +-
 .../value_builder/marc21_linking_section.tt   |  2 +-
 .../value_builder/unimarc_field_210c.tt       |  2 +-
 .../value_builder/unimarc_field_4XX.tt        |  2 +-
 .../modules/cataloguing/z3950_auth_search.tt  |  4 ++--
 .../en/modules/cataloguing/z3950_search.tt    |  4 ++--
 .../circ/circulation_batch_checkouts.tt       |  2 +-
 .../prog/en/modules/circ/curbside_pickups.tt  | 18 +++++++-------
 .../prog/en/modules/circ/overdue.tt           |  2 +-
 .../prog/en/modules/circ/pendingreserves.tt   |  6 ++---
 .../prog/en/modules/installer/step3.tt        | 10 ++++----
 .../en/modules/labels/label-bib-search.tt     |  2 +-
 .../en/modules/labels/label-edit-batch.tt     |  2 +-
 .../en/modules/labels/label-edit-range.tt     |  2 +-
 .../prog/en/modules/labels/label-print.tt     |  2 +-
 .../prog/en/modules/labels/search.tt          |  2 +-
 .../prog/en/modules/members/apikeys.tt        |  8 +++----
 .../prog/en/modules/members/files.tt          |  2 +-
 .../prog/en/modules/members/member.tt         |  2 +-
 .../prog/en/modules/members/memberentrygen.tt |  6 ++---
 .../prog/en/modules/members/notices.tt        |  2 +-
 .../en/modules/members/two_factor_auth.tt     |  2 +-
 .../prog/en/modules/members/update-child.tt   |  2 +-
 .../en/modules/onboarding/onboardingstep1.tt  |  2 +-
 .../en/modules/onboarding/onboardingstep2.tt  |  2 +-
 .../en/modules/onboarding/onboardingstep3.tt  |  2 +-
 .../en/modules/onboarding/onboardingstep4.tt  |  2 +-
 .../en/modules/onboarding/onboardingstep5.tt  |  2 +-
 .../prog/en/modules/patroncards/edit-batch.tt |  2 +-
 .../en/modules/patroncards/edit-layout.tt     |  2 +-
 .../en/modules/patroncards/edit-profile.tt    |  2 +-
 .../en/modules/patroncards/edit-template.tt   |  2 +-
 .../en/modules/patroncards/image-manage.tt    |  4 ++--
 .../prog/en/modules/patroncards/print.tt      |  2 +-
 .../prog/en/modules/plugins/plugins-upload.tt |  2 +-
 .../intranet-tmpl/prog/en/modules/pos/pay.tt  |  2 +-
 .../prog/en/modules/pos/register.tt           |  4 ++--
 .../prog/en/modules/pos/registers.tt          |  2 +-
 .../en/modules/recalls/recalls_overdue.tt     |  2 +-
 .../prog/en/modules/recalls/recalls_queue.tt  |  2 +-
 .../en/modules/recalls/recalls_to_pull.tt     |  2 +-
 .../en/modules/recalls/recalls_waiting.tt     |  4 ++--
 .../prog/en/modules/recalls/request.tt        |  2 +-
 .../modules/reports/guided_reports_start.tt   | 12 +++++-----
 .../prog/en/modules/serials/claims.tt         |  2 +-
 .../prog/en/modules/serials/routing.tt        |  2 +-
 .../prog/en/modules/serials/serials-edit.tt   |  2 +-
 .../en/modules/serials/subscription-add.tt    |  4 ++--
 .../en/modules/serials/subscription-detail.tt |  2 +-
 .../serials/subscription-frequencies.tt       |  4 ++--
 .../modules/serials/subscription-history.tt   |  2 +-
 .../serials/subscription-numberpatterns.tt    |  4 ++--
 .../en/modules/serials/subscription-renew.tt  |  2 +-
 .../prog/en/modules/suggestion/suggestion.tt  |  2 +-
 .../en/modules/tools/additional-contents.tt   |  6 ++---
 .../automatic_item_modification_by_age.tt     |  2 +-
 .../prog/en/modules/tools/batchMod-del.tt     |  4 ++--
 .../prog/en/modules/tools/batchMod-edit.tt    |  2 +-
 .../prog/en/modules/tools/batchMod.tt         |  2 +-
 .../en/modules/tools/batch_delete_records.tt  |  4 ++--
 .../modules/tools/batch_extend_due_dates.tt   |  4 ++--
 .../tools/batch_record_modification.tt        |  4 ++--
 .../prog/en/modules/tools/csv-profiles.tt     |  4 ++--
 .../prog/en/modules/tools/export.tt           |  8 +++----
 .../prog/en/modules/tools/inventory.tt        |  2 +-
 .../prog/en/modules/tools/letter.tt           |  8 +++----
 .../en/modules/tools/manage-marc-import.tt    | 10 ++++----
 .../tools/marc_modification_templates.tt      |  4 ++--
 .../prog/en/modules/tools/modborrowers.tt     |  4 ++--
 .../prog/en/modules/tools/overduerules.tt     |  2 +-
 .../prog/en/modules/tools/picture-upload.tt   |  2 +-
 .../prog/en/modules/tools/quotes.tt           |  4 ++--
 .../prog/en/modules/tools/stockrotation.tt    | 10 ++++----
 .../prog/en/modules/tools/upload.tt           |  6 ++---
 .../prog/en/modules/virtualshelves/shelves.tt | 12 +++++-----
 .../en/includes/opac-detail-sidebar.inc       |  2 +-
 .../en/modules/opac-alert-subscribe.tt        |  4 ++--
 .../en/modules/opac-alert-subscriptions.tt    |  2 +-
 .../en/modules/opac-authorities-home.tt       |  2 +-
 .../en/modules/opac-curbside-pickups.tt       |  6 ++---
 .../bootstrap/en/modules/opac-passwd.tt       |  2 +-
 .../en/modules/opac-patron-consent.tt         |  2 +-
 .../bootstrap/en/modules/opac-privacy.tt      |  8 +++----
 .../bootstrap/en/modules/opac-recall.tt       |  2 +-
 .../bootstrap/en/modules/opac-recalls.tt      |  2 +-
 .../en/modules/opac-reportproblem.tt          |  2 +-
 .../en/modules/opac-reset-password.tt         |  2 +-
 .../bootstrap/en/modules/opac-shelves.tt      | 24 +++++++++----------
 .../bootstrap/en/modules/opac-suggestions.tt  |  8 +++----
 .../bootstrap/en/modules/opac-user.tt         |  4 ++--
 .../bootstrap/en/modules/sci/sci-main.tt      |  2 +-
 .../bootstrap/en/modules/sco/sco-main.tt      | 20 ++++++++--------
 164 files changed, 323 insertions(+), 323 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
index a5f7e0c6c7..bf80bcabb4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
@@ -25,7 +25,7 @@
                     <div class="btn-group">
                         <form action="/cgi-bin/koha/acqui/supplier.pl" method="post">
                             [% INCLUDE 'csrf-token.inc' %]
-                            <input type="hidden" name="op-cud" value="delete" />
+                            <input type="hidden" name="op" value="cud-delete" />
                             <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
                             <button class="btn btn-default" id="deletesupplier" type="submit"><i class="fa fa-trash-can"></i> Delete vendor</button>
                         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
index 9afbdd6143..8bae177e8f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
@@ -89,7 +89,7 @@
                     [% END %]
                     <label for="export_items_bundle_contents">Export items bundle contents</label> <input type="checkbox" name="export_items_bundle_contents" id="export_items_bundle_contents">
                     <label for="export_remove_fields">Don't export fields:</label> <input type="text" id="export_remove_fields" name="export_remove_fields" value="[% Koha.Preference('ExportRemoveFields') | html %]" title="Use for MARC exports" />
-                    <input type="hidden" name="op-cud" value="export" />
+                    <input type="hidden" name="op" value="cud-export" />
                     <input type="hidden" id="output_format" name="output_format" value="iso2709" />
                     <input type="hidden" id="dont_export_item" name="dont_export_item" value="0" />
                     <input type="hidden" id="record_type" name="record_type" value="bibs" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index dc9f5f46d5..5ad4a3bcb4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -227,7 +227,7 @@
                             <input type="hidden" id="cardnumber" name="cardnumber" value="[% patron.cardnumber | html %]" />
                             <input type="hidden" id="borrowernumber" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
                             <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-upload"></i> Upload photo</button>
-                            <input name="op-cud" type="hidden" value="Upload" />
+                            <input name="op" type="hidden" value="cud-Upload" />
                             [% IF ( patron.image ) %]
                                 <a id="delpicture"
                                     href="/cgi-bin/koha/tools/picture-upload.pl?op=Delete&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;csrf_token=[% csrf_token | html %]"
@@ -266,7 +266,7 @@
                         <input type="hidden" name="filetype" value="image" />
                         <input type="hidden" name="cardnumber" value="[% patron.cardnumber | html %]" />
                         <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
-                        <input name="op-cud" type="hidden" value="Upload" />
+                        <input name="op" type="hidden" value="cud-Upload" />
                     </form>
                 </div>
                 <div class="dialog message" style="display:none" id="camera-error">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/serials_multi_receiving.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/serials_multi_receiving.inc
index 527b35b72b..4aa3c1639b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/serials_multi_receiving.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/serials_multi_receiving.inc
@@ -16,7 +16,7 @@
                                 <input type="checkbox" id="date_received_today" name="date_received_today" />
                             </li>
                         </ol>
-                        <input type="hidden" name="op-cud" value="gennext" />
+                        <input type="hidden" name="op" value="cud-gennext" />
 
                         [%# subscriptionidlist is used from serials-collection, subscriptionid is used from serils-edit %]
                         <input type="hidden" name="subscriptionid" value="[% subscriptionidlist || subscriptionid | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
index 7474b1d054..d588bd477c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
@@ -19,7 +19,7 @@
                     <a id="deleteshelf_toolbar" href="#">Delete list</a>
                     <form id="deleteshelf_toolbar_form" action="shelves.pl" method="post">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="delete">
+                        <input type="hidden" name="op" value="cud-delete">
                         <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]">
                     </form>
                 </li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index 7e6b4f1501..1e3a4eb730 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -138,7 +138,7 @@
                                         </div>
                                     </div> <!-- /#searchheader -->
 
-                                    <input type="hidden" name="op-cud" value="import_records"/>
+                                    <input type="hidden" name="op" value="cud-import_records"/>
                                     <input type="hidden" name="basketno" value="[% basketno | html %]" />
                                     <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
                                     <input type="hidden" name="import_batch_id" value="[% import_batch_id | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index c4fc48c5c0..ca9ab9c8c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -108,7 +108,7 @@
                                             <div class="btn-group">
                                                 <form action="/cgi-bin/koha/acqui/basket.pl" method="post">
                                                     [% INCLUDE 'csrf-token.inc' %]
-                                                    <input type="hidden" name="op-cud" value="email" />
+                                                    <input type="hidden" name="op" value="cud-email" />
                                                     <input type="hidden" name="basketno" value="[% basketno | html %]" />
                                                     <button type="submit" class="btn btn-default" id="emailvendorbutton"><i class="fa-solid fa-envelope"></i> E-mail order</button>
                                                 </form>
@@ -331,7 +331,7 @@
                                                                 </div>
                                                                 <input type="hidden" id="basketno" name="basketno" value="[% basketno | html %]" />
                                                                 <input type="hidden" id="users_ids" name="users_ids" value="[% users_ids | html %]" />
-                                                                <input type="hidden" id="op" name="op-cud" value="mod_users" />
+                                                                <input type="hidden" id="op" name="op" value="cud-mod_users" />
                                                             </form>
 
                                                         </li> <!-- /#managedby -->
@@ -363,7 +363,7 @@
                                                                         </select>
                                                                         <a id="library_entry_cancel" href="#" class="cancel">Cancel</a>
                                                                         <input type="hidden" id="basketno" name="basketno" value="[% basketno | html %]" />
-                                                                        <input type="hidden" id="op" name="op-cud" value="mod_branch" />
+                                                                        <input type="hidden" id="op" name="op" value="cud-mod_branch" />
                                                                     </form>
                                                                 </div>
                                                             </li> <!-- #/managing_library_entry -->
@@ -428,7 +428,7 @@
                                                                             </select>
                                                                             <a href="#" id="basket_group_cancel" class="cancel">Cancel</a>
                                                                             <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
-                                                                            <input type="hidden" value="mod_basket" name="op-cud" />
+                                                                            <input type="hidden" value="cud-mod_basket" name="op" />
                                                                             <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
                                                                         </form>
                                                                     </div>
@@ -927,7 +927,7 @@
                     <div class="modal-body">
                         <textarea id="ordernotes" name="ordernotes" rows="3" cols="30" class="focus">[% ordernotes | html %]</textarea>
                         <input type="hidden" id="ordernumber" name="ordernumber" value="" />
-                        <input type="hidden" name="op-cud" value="save" />
+                        <input type="hidden" name="op" value="cud-save" />
                         <input type="hidden" id="type" name="type" value="" />
                     </div>
                     <div class="modal-footer">
@@ -953,7 +953,7 @@
                         <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% books_loo.estimated_delivery_date | html %]"/>
                         <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                         <input type="hidden" id="date_ordernumber" name="ordernumber" value="" />
-                        <input type="hidden" name="op-cud" value="save" />
+                        <input type="hidden" name="op" value="cud-save" />
                     </div>
                     <div class="modal-footer">
                         <button type="submit" class="btn btn-default">Save</button>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
index 5b85b502a1..91a7e34001 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -233,7 +233,7 @@
                                         [% IF ( basketgroupid ) %]
                                             <input type="hidden" name="basketgroupid" value="[% basketgroupid | html %]" />
                                         [% END %]
-                                        <input type="hidden" name="op-cud" value="attachbasket" />
+                                        <input type="hidden" name="op" value="cud-attachbasket" />
                                         <input type="submit" class="btn btn-primary" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]" class="cancel">Cancel</a>
                                     </fieldset>
                                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
index 56fd4e53e3..c502ee391f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
@@ -148,7 +148,7 @@
         [% END %]
 
         <fieldset class="action">
-            <input type="hidden" name="op-cud" value="add_validate" />
+            <input type="hidden" name="op" value="cud-add_validate" />
             <input type="submit" class="btn btn-primary" value="Save" />
             [% IF ( basketno ) %]
                 <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
index 75000595b7..159faeb75c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
@@ -68,7 +68,7 @@
         </legend>
         <div id="orders_filters">
             [% INCLUDE 'filter-orders.inc' %]
-            <input type="hidden" name="op-cud" value="select" />
+            <input type="hidden" name="op" value="cud-select" />
             <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
 
             <input type="hidden" name="ordernumbers" value="[% ordernumbers.join(',') | html %]" />
@@ -177,7 +177,7 @@
         </table>
     </div>
     <fieldset class="action">
-        <input type="hidden" name="op-cud" value="batch_edit" />
+        <input type="hidden" name="op" value="cud-batch_edit" />
         <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
         <button type="submit" class="btn btn-primary go_to_batch_edit">Next <i class="fa fa-fw fa-arrow-right"></i></button>
     </fieldset>
@@ -256,7 +256,7 @@
         [% FOREACH ordernumber IN ordernumbers %]
             <input type="hidden" name="ordernumber" value="[% ordernumber | html %]" />
         [% END %]
-        <input type="hidden" name="op-cud" value="do_duplicate" />
+        <input type="hidden" name="op" value="cud-do_duplicate" />
         <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
         <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->
         <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt
index ba206ee6af..c0e98e3f5e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt
@@ -94,7 +94,7 @@
               <fieldset class="rows">
                   <legend>Upload new file</legend>
                   <ol>
-                      <li><input type="hidden" name="op-cud" value="upload" />
+                      <li><input type="hidden" name="op" value="cud-upload" />
                       <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" />
                       <label for="description">Description:</label>
                       <input name="description" id="description" type="text" /></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
index 2b0146d2c5..babe8a92a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
@@ -137,7 +137,7 @@
                     </fieldset>
                     [% UNLESS readonly %]
                         <fieldset class="action">
-                            <input type="hidden" name="op-cud" value="mod" />
+                            <input type="hidden" name="op" value="cud-mod" />
                             <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" />
                             <input type="submit" class="btn btn-primary" value="Save" />
                             [% IF CAN_user_acquisition_delete_invoices AND NOT orders_loop.size %]
@@ -292,7 +292,7 @@
                     </fieldset>
                     [% UNLESS readonly %]
                         <fieldset class="action" id="submit_invoice_adjustment">
-                            <input type="hidden" name="op-cud" value="mod_adj" />
+                            <input type="hidden" name="op" value="cud-mod_adj" />
                             <input type="submit" class="btn btn-primary" value="Update adjustments" />
                             <a href="#" id="cancel_invoice_adjustment" class="toggle_invoice_adjustment cancel" style="display:none"><i class="fa fa-times"></i> Cancel</a>
                         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
index 6ae46ae220..b045a90264 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -226,7 +226,7 @@
                                             <input type="submit" class="btn btn-primary" value="Merge" />
                                         </li>
                                     </ol>
-                                    <input type="hidden" name="op-cud" value="mod" />
+                                    <input type="hidden" name="op" value="cud-mod" />
                                     <input type="hidden" id="merge_invoiceid" name="invoiceid" value="" />
                                 </fieldset> <!-- /.rows -->
                             </form> <!-- /#merge_invoice_form -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index 603c221e54..f5a4acb163 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -55,7 +55,7 @@
 [% IF lateorders.size %]
 <form action="lateorders.pl" name="claim" method="post">
     [% INCLUDE 'csrf-token.inc' %]
-  <input type="hidden" name="op-cud" value="send_alert" />
+  <input type="hidden" name="op" value="cud-send_alert" />
   <input type="hidden" name="delay" value="[% delay | html %]" />
   <input type="hidden" name="booksellerid" value="[% bookseller_filter.id | html %]" />
 	[% IF ( letters ) %]
@@ -290,7 +290,7 @@
                 <div class="modal-body">
                 <textarea id="ordernotes" name="ordernotes" rows="3" cols="30" class="focus">[% ordernotes | html %]</textarea>
                 <input type="hidden" id="notes_ordernumber" name="ordernumber" value="" />
-                <input type="hidden" name="op-cud" value="save" />
+                <input type="hidden" name="op" value="cud-save" />
                 <input type="hidden" id="type" name="type" value="" />
             </div>
             <div class="modal-footer">
@@ -316,7 +316,7 @@
                 <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% estimated_delivery_date | html %]"/>
                 <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                 <input type="hidden" id="date_ordernumber" name="ordernumber" value="" />
-                <input type="hidden" name="op-cud" value="save" />
+                <input type="hidden" name="op" value="cud-save" />
             </div>
             <div class="modal-footer">
                 <button type="submit" class="btn btn-default">Save</button>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt
index dd9073fbfb..7b571a4021 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt
@@ -46,7 +46,7 @@
         </fieldset>
         <input type="hidden" name="referrer" value="[% referrer | html %]" />
         <input type="hidden" name="ordernumber" value="[% ordernumber | html %]" />
-        <input type="hidden" name="op-cud" value="save" />
+        <input type="hidden" name="op" value="cud-save" />
         <fieldset class="action">
           <input type="submit" class="btn btn-primary" value="Save" />
           <a class="cancel" href="[% referrer | url %]">Cancel</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
index ee5af1446a..5e2b066603 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
@@ -55,7 +55,7 @@
         </fieldset>
         <input type="hidden" name="referrer" value="[% referrer | html %]" />
         <input type="hidden" name="ordernumber" value="[% ordernumber | html %]" />
-        <input type="hidden" name="op-cud" value="save" />
+        <input type="hidden" name="op" value="cud-save" />
         <input type="hidden" name="type" value="[% type | html %]" />
         <fieldset class="action">
           <input type="submit" class="btn btn-primary" value="Save" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 60902f65b4..fd5bf94ffe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -308,7 +308,7 @@
                 [% END %]
                 </select>
                 <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
-                <input type="hidden" value="mod_basket" name="op-cud" />
+                <input type="hidden" value="cud-mod_basket" name="op" />
                 <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
             </li>
             <fieldset class="action"><input type="submit" class="btn btn-primary" value="Change basketgroup" /></fieldset>
@@ -338,7 +338,7 @@
                       [% END %]
                     </ul>
                     <input type="hidden" id="users_ids" name="users_ids" value="[% users_ids | html %]" />
-                    <input type="hidden" id="op" name="op-cud" value="mod_users" />
+                    <input type="hidden" id="op" name="op" value="cud-mod_users" />
                     <input type="button" id="add_user" class="btn btn-default" onclick="UserSearchPopup();" value="Add user" />
                 </div>
             </li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
index a1b4dfc1f8..68235994d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -108,7 +108,7 @@
             [% INCLUDE 'csrf-token.inc' %]
             <fieldset class="rows">
                 <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
-                <input type="hidden" name="op-cud" value="validate" />
+                <input type="hidden" name="op" value="cud-validate" />
                 <table id="uncertainpricet">
                     <thead>
                         <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt
index deb7e57269..995a607298 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt
@@ -94,7 +94,7 @@
 
     <form action="/cgi-bin/koha/acqui/vendor_issues.pl" name="Aform" method="post" class="validated">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="add_validate" />
+        <input type="hidden" name="op" value="cud-add_validate" />
         <input type="hidden" name="booksellerid" value="[% vendor.id | html %]" />
         <input type="hidden" name="issue_id" value="[% issue.issue_id| html %]" />
 
@@ -136,7 +136,7 @@
         <h1>Delete issue [% issue.issue_id | html %]?</h1>
         <form action="/cgi-bin/koha/acqui/vendor_issues.pl" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="delete_confirmed" />
+            <input type="hidden" name="op" value="cud-delete_confirmed" />
             <input type="hidden" name="issue_id" value="[% issue.issue_id | html %]" />
             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index 0bfb247c75..1556470c56 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -87,7 +87,7 @@ tr.selected td {
     <div class="row">
     <div class="col-sm-6">
     <h1>Order from external source</h1>
-    <input type="hidden" name="op-cud" id="op" value="do_search" />
+    <input type="hidden" name="op" id="op" value="cud-do_search" />
 	    <fieldset class="rows">
          <ol>
              <li><label for="isbn">ISBN: </label> <input type="text" id="isbn" name="isbn" value="[% isbn | html %]" /></li>
@@ -249,7 +249,7 @@ tr.selected td {
 
     <form method="post" action="z3950_search.pl" id="page_form" name="page_form" class="checkboxed">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" id="op" value="do_search" />
+        <input type="hidden" name="op" id="op" value="cud-do_search" />
         <input type="hidden" name="current_page" id="current_page" value="[% current_page | html %]" />
         <input type="hidden" id="searchtitle"  name="title" value="[% title | html %]" />
         <input type="hidden" id="isbn" name="isbn" value="[% isbn | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
index 91055da5df..c42c266505 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
@@ -252,7 +252,7 @@
                     <input type="hidden" name="field_id" value="[% field.id | html %]" />
                 [% END %]
                 <input type="hidden" name="tablename" value="[% tablename | html %]" />
-                <input type="hidden" name="op-cud" value="add" />
+                <input type="hidden" name="op" value="cud-add" />
                 <input type="submit" class="btn btn-primary" value="Save" />
                 <a href="?tablename=[% tablename | uri %]" class="cancel">Cancel</a>
             </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index 9970d815d1..b4656071ff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -61,7 +61,7 @@
                 <fieldset>
                     <h4><a href="/cgi-bin/koha/admin/preferences.pl">System preferences</a></h4>
                     <p>Manage system preferences like MARC flavor, date format, administrator email, and templates.</p>
-                    <input type="hidden" name="op-cud" value="search" />
+                    <input type="hidden" name="op" value="cud-search" />
                     <input type="text" name="searchfield" value="[% searchfield | html %]" />
                     <input type="submit" name="ok" class="btn btn-primary" value="Search" />
                 </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
index 5afd6be1da..af4f555e78 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
@@ -47,7 +47,7 @@
                     <form id="adveditor_shortcuts" method="post" action="/cgi-bin/koha/admin/adveditorshortcuts.pl">
                         [% INCLUDE 'csrf-token.inc' %]
                         <fieldset>
-                        <input type=hidden name="op-cud" value="save" />
+                        <input type=hidden name="op" value="cud-save" />
 
                         <table id="adv_editor_keyboard_shortcuts">
                             <thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
index 7685514d06..9ed1b2a704 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -158,7 +158,7 @@
 <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" id="add_modify_budget" name="f" method="post">
     [% INCLUDE 'csrf-token.inc' %]
     <fieldset class="rows">
-    <input type="hidden" name="op-cud" value="duplicate_budget" />
+    <input type="hidden" name="op" value="cud-duplicate_budget" />
     <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
 
     <ol>
@@ -231,7 +231,7 @@
     <!-- ################################################################################# -->
     <!-- display information about the budget period that must be added or modified -->
     <!-- ################################################################################# -->
-    <input type="hidden" name="op-cud" value="add_validate" />
+    <input type="hidden" name="op" value="cud-add_validate" />
     <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
     <ol>
     <li>
@@ -320,7 +320,7 @@
 
     <form action="[% script_name | html %]" method="post">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="delete_confirmed" />
+        <input type="hidden" name="op" value="cud-delete_confirmed" />
         <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
         <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
     </form>
@@ -391,7 +391,7 @@
             </ol>
           </fieldset>
           <fieldset class="action">
-              <input type="hidden" name="op-cud" value="close_confirmed" />
+              <input type="hidden" name="op" value="cud-close_confirmed" />
               <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
               <input type="submit" class="btn btn-primary" value="Move unreceived orders" />
               <a class="cancel" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Cancel</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index a1cce1b2c4..b30ac9de90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -297,7 +297,7 @@
     <fieldset class="rows">
         <legend class="sr-only">Fund details</legend>
 
-    <input type="hidden" name="op-cud" value="add_validate" />
+    <input type="hidden" name="op" value="cud-add_validate" />
     <input type="hidden" name="checked" value="0" />
     <ol>
     [% IF ( budget_parent_id ) %]
@@ -470,7 +470,7 @@
 
         <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="delete_confirmed" />
+            <input type="hidden" name="op" value="cud-delete_confirmed" />
             <input type="hidden" name="budget_id" value="[% budget_id | html %]" />
             <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this fund</button>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
index 4cd60e92db..e6e9eeddfc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
@@ -104,7 +104,7 @@
                 <div class="page-section">
                     <form name="Aform" action="/cgi-bin/koha/admin/aqcontract.pl" id="add_modify_contract" method="post">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="add_validate" />
+                        <input type="hidden" name="op" value="cud-add_validate" />
                         <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
                         <input type="hidden" name="checked" value="0" />
                         [% IF ( contractnumber ) %]
@@ -165,7 +165,7 @@
                         </table>
                         <form action="[% script_name | html %]" method="post">
                             [% INCLUDE 'csrf-token.inc' %]
-                            <input type="hidden" name="op-cud" value="delete_confirmed" />
+                            <input type="hidden" name="op" value="cud-delete_confirmed" />
                             <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
                             <input type="hidden" name="contractnumber" value="[% contractnumber | html %]" />
                             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete contract</button>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
index 62e681da50..0a6715b1d0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
@@ -170,7 +170,7 @@
         [% IF ( budget_period_locked ) %]
             <!-- <input STYLE="background: gray;"   type="submit" value="Save" disabled="disabled"/> -->
         [% ELSE %]
-            <input type="hidden" name="op-cud" value="save" />
+            <input type="hidden" name="op" value="cud-save" />
             <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" /></fieldset>
         [% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
index c7965bbf35..4132122270 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
@@ -102,7 +102,7 @@
     <div class="hint">You can drag and drop the subfield tabs to change the order.</div>
     <form action="[% script_name | html %]" name="Aform" method="post">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="add_validate" />
+        <input type="hidden" name="op" value="cud-add_validate" />
         <input type="hidden" name="tagfield" value="[% tagfield | html %]" />
         <input type="hidden" name="authtypecode" value="[% authtypecode | html %]" />
         <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save changes" /> <a class="cancel" href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;authtypecode=[% authtypecode | uri %]">Cancel</a></fieldset>
@@ -305,7 +305,7 @@
         <h1>Confirm deletion of subfield <span class="ex">'[% ass.tagsubfield | html %]'?</span></h1>
         <form action="[% delete_link | html %]" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="delete_confirmed" />
+            <input type="hidden" name="op" value="cud-delete_confirmed" />
             <table>
                 <tr><th scope="row">Subfield:</th> <td>[% ass.tagsubfield | html %]</td></tr>
                 <tr><th scope="row">Description:</th> <td>[% ass.liblibrarian | html_entity %]</td></tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
index 0050c967cc..1d1b1e83ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
@@ -139,7 +139,7 @@
     </h2>
     <form action="[% script_name | html %]" name="Aform" method="post" class="validated">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="add_validate" />
+        <input type="hidden" name="op" value="cud-add_validate" />
         [% IF ( heading_modify_tag_p ) %]<input type="hidden" name="modif" value="1" />[% END %]
         <input type="hidden" name="authtypecode" value="[% authtypecode | html %]" />
         <fieldset class="rows">
@@ -198,7 +198,7 @@
             <table>
                 <tr><th scope="row">Tag: </th><td>[% searchfield | html %] [% liblibrarian | html %]</td></tr>
             </table>
-            <input type="hidden" name="op-cud" value="delete_confirmed" />
+            <input type="hidden" name="op" value="cud-delete_confirmed" />
             <input type="hidden" name="authtypecode" value="[% authtypecode | html %]" />
             <input type="hidden" name="searchfield" value="[% searchfield | html %]" />
             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
@@ -223,7 +223,7 @@
 
     <form action="[% script_name | html %]" method="post">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="authtype_create_confirm" />
+        <input type="hidden" name="op" value="cud-authtype_create_confirm" />
         <input type="hidden" name="authtypecode" value="[% authtypecode | html %]" />
         Create authority framework for [% authtypecode | html %] using
         <select name="existingauthtypecode">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
index 75d034d1c2..3ca17300ea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
@@ -132,14 +132,14 @@
                                         <label for="category" class="required">Category: </label>
                                         <input type="text" name="category"  id="category" size="32" maxlength="32" class="focus required" />
                                         <span class="required">Required</span>
-                                        <input type="hidden" name="op-cud" value="add_category" />
+                                        <input type="hidden" name="op" value="cud-add_category" />
                                     </li>
                                 </ol>
                             [% ELSE %]
                                 <ol>
                                     <li>
                                         <span class="label">Category</span>
-                                        <input type="hidden" name="op-cud" value="add" />
+                                        <input type="hidden" name="op" value="cud-add" />
                                         <input type="hidden" name="category" value="[% category_name | html %]" /> [% category_name | html %]
                                     </li>
                                     <li>
@@ -314,7 +314,7 @@
                                 [% UNLESS category.is_system %]
                                     <form id="delete_category" action="/cgi-bin/koha/admin/authorised_values.pl" method="post">
                                         [% INCLUDE 'csrf-token.inc' %]
-                                        <input type="hidden" name="op-cud" value="delete_category" />
+                                        <input type="hidden" name="op" value="cud-delete_category" />
                                         <input type="hidden" name="category_name" value="[% category.category_name | html %]" />
                                         <button type="submit"><i class="fa fa-plus"></i> Delete category '[% category.category_name | html %]' </button>
                                     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
index 4c4714e2b8..5896a00924 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
@@ -124,7 +124,7 @@
                 <li>
                     [% IF authority_type.authtypecode.defined %]
                             <span class="label">Authority type</span>
-                            <input type="hidden" name="op-cud" value="add_validate" />
+                            <input type="hidden" name="op" value="cud-add_validate" />
                             <input type="hidden" name="checked" value="0" />
                             <input type="hidden" name="authtypecode" value="[% authority_type.authtypecode | html %]" />[% authority_type.authtypecode | html %]
                     [% ELSE %]
@@ -147,7 +147,7 @@
                     <label for="auth_tag_to_report">Authority field to copy: </label>
                     <input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="[% authority_type.auth_tag_to_report | html %]" />
                     <div class="hint">Note: for 'Authority field to copy', enter the authority field that should be copied from the authority record to the bibliographic record. E.g., in MARC21, field 100 in the authority record should be copied to field 100 in the bibliographic record</div>
-                    <input type="hidden" name="op-cud" value="add_validate" />
+                    <input type="hidden" name="op" value="cud-add_validate" />
                     [% IF authority_type.authtypecode.defined %]
                         <input type="hidden" name="is_a_modif" value="1" />
                     [% END %]
@@ -174,7 +174,7 @@
             <h1>Confirm deletion of authority structure definition for <span class="ex">'[% authority_type.authtypetext | html %]' ([% authority_type.authtypecode | html %])</span></h1>
             <form action="/cgi-bin/koha/admin/authtypes.pl" method="post">
                 [% INCLUDE 'csrf-token.inc' %]
-                <input type="hidden" name="op-cud" value="delete_confirmed" />
+                <input type="hidden" name="op" value="cud-delete_confirmed" />
                 <input type="hidden" name="authtypecode" value="[% authority_type.authtypecode | html %]" />
                 <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
             </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
index 6282f7c176..00dc32dfc7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
@@ -116,7 +116,7 @@
     </h1>
     <form action="/cgi-bin/koha/admin/biblio_framework.pl" name="Aform" method="post" class="validated">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="add_validate" />
+        <input type="hidden" name="op" value="cud-add_validate" />
         <fieldset class="rows">
             <ol>
                 [% IF framework %]
@@ -158,7 +158,7 @@
             <h1>[% tx("Confirm deletion of framework '{framework}' ({frameworkcode})?", { framework = framework.frameworktext, frameworkcode = framework.frameworkcode }) | html %]</h1>
             <form class="inline" action="/cgi-bin/koha/admin/biblio_framework.pl" method="post">
                 [% INCLUDE 'csrf-token.inc' %]
-                <input type="hidden" name="op-cud" value="delete_confirmed" />
+                <input type="hidden" name="op" value="cud-delete_confirmed" />
                 <input type="hidden" name="frameworkcode" value="[% framework.frameworkcode | html %]" />
                 <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this framework</button>
             </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
index bd70ed2cd5..81a2a09c21 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
@@ -106,7 +106,7 @@
                     [% INCLUDE 'csrf-token.inc' %]
 
                     <fieldset class="rows">
-                        <input type="hidden" name="op-cud" value="add_validate" />
+                        <input type="hidden" name="op" value="cud-add_validate" />
                         <ol>
                         [% IF cash_register %]
                             <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
index aa1ec7fd4f..2144484642 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
@@ -116,7 +116,7 @@
 [% IF op == 'add_form' %]
     <form id="category_form" action="/cgi-bin/koha/admin/categories.pl" method="post">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="add_validate" />
+        <input type="hidden" name="op" value="cud-add_validate" />
         <input type="hidden" name="checked" value="0" />
         [% IF category %]
             <h1>[% tx("Modify category '{categorycode}'", { categorycode = categorycode }) | html %]</h1>
@@ -535,7 +535,7 @@
             [% IF patrons_in_category > 0 %]
                 <input type="submit" class="btn btn-primary" value="OK" />
             [% ELSE %]
-                <input type="hidden" name="op-cud" value="delete_confirmed" />
+                <input type="hidden" name="op" value="cud-delete_confirmed" />
                 <input type="hidden" name="categorycode" value="[% categorycode | html %]" />
                 <input type="submit" class="btn btn-primary" value="Delete this category" />
                 <a class="cancel" href="/cgi-bin/koha/admin/categories.pl">Cancel</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
index dd0dde61c1..5de5ef1162 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
@@ -103,7 +103,7 @@
 
     <form action="/cgi-bin/koha/admin/cities.pl" name="Aform" method="post" class="validated">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="add_validate" />
+        <input type="hidden" name="op" value="cud-add_validate" />
         <input type="hidden" name="cityid" value="[% city.cityid | html %]" />
 
         <fieldset class="rows">
@@ -161,7 +161,7 @@
         </table>
         <form action="/cgi-bin/koha/admin/cities.pl" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="delete_confirmed" />
+            <input type="hidden" name="op" value="cud-delete_confirmed" />
             <input type="hidden" name="cityid" value="[% city.cityid | html %]" />
             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
index 73e47bb6b9..52db26d482 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
@@ -150,7 +150,7 @@
   [% END %]
 <form action="[% script_name | html %]" name="Aform" class="validated" method="post">
     [% INCLUDE 'csrf-token.inc' %]
-  <input type="hidden" name="op-cud" value="add_source_validate" />
+  <input type="hidden" name="op" value="cud-add_source_validate" />
   <fieldset class="rows">
     <ol>
       <li>
@@ -215,7 +215,7 @@
   [% END %]
 <form action="[% script_name | html %]" name="Aform" class="validated" method="post">
     [% INCLUDE 'csrf-token.inc' %]
-  <input type="hidden" name="op-cud" value="add_sort_rule_validate" />
+  <input type="hidden" name="op" value="cud-add_sort_rule_validate" />
   <fieldset class="rows">
     <ol>
       <li>
@@ -262,7 +262,7 @@
   [% END %]
 <form action="[% script_name | html %]" name="Aform" class="validated" method="post">
     [% INCLUDE 'csrf-token.inc' %]
-  <input type="hidden" name="op-cud" value="add_split_rule_validate" />
+  <input type="hidden" name="op" value="cud-add_split_rule_validate" />
   <fieldset class="rows">
     <ol>
       <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
index 675dfe3334..ac02011d62 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
@@ -85,7 +85,7 @@
 
                     <form action="/cgi-bin/koha/admin/credit_types.pl" name="Aform" method="post" class="validated">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="add_validate" />
+                        <input type="hidden" name="op" value="cud-add_validate" />
                         <fieldset class="rows">
                             <ol>
                                 <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
index 2e1694214e..7a2a532a7b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
@@ -167,7 +167,7 @@
             </div>
         </div>
 
-        <input type="hidden" name="op-cud" value="save" />
+        <input type="hidden" name="op" value="cud-save" />
 
         <fieldset class="action">
             <input type="submit" class="btn btn-primary" value="Save configuration" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
index 5aaa7a39b4..1ea411acc2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
@@ -111,7 +111,7 @@
 
 <form action="/cgi-bin/koha/admin/currency.pl" name="Aform" method="post" class="validated">
     [% INCLUDE 'csrf-token.inc' %]
-    <input type="hidden" name="op-cud" value="add_validate" />
+    <input type="hidden" name="op" value="cud-add_validate" />
     <fieldset class="rows">
         <legend class="sr-only">New currency entry form</legend>
         <ol>
@@ -198,7 +198,7 @@
         </table>
         <form action="/cgi-bin/koha/admin/currency.pl" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="delete_confirmed" />
+            <input type="hidden" name="op" value="cud-delete_confirmed" />
             <input type="hidden" name="currency_code" value="[% currency.currency | html %]" />
             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this currency</button>
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
index cd03e769f4..a4c259ff11 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
@@ -84,7 +84,7 @@
 
                     <form action="/cgi-bin/koha/admin/debit_types.pl" name="Aform" method="post" class="validated">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="add_validate" />
+                        <input type="hidden" name="op" value="cud-add_validate" />
                         <fieldset class="rows">
                             <ol>
                                 <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
index 6af8993656..35e373dd51 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
@@ -100,7 +100,7 @@
 
     <form action="/cgi-bin/koha/admin/desks.pl" name="Aform" method="post" class="validated">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="add_validate" />
+        <input type="hidden" name="op" value="cud-add_validate" />
         <input type="hidden" name="desk_id" value="[% desk.desk_id | html %]" />
 
         <fieldset class="rows">
@@ -157,7 +157,7 @@
         </table>
         <form action="/cgi-bin/koha/admin/desks.pl" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="delete_confirmed" />
+            <input type="hidden" name="op" value="cud-delete_confirmed" />
             <input type="hidden" name="desk_id" value="[% desk.desk_id | html %]" />
             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
index 62d2835116..c7a9c0fa14 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
@@ -86,7 +86,7 @@
 [% IF acct_form %]
 <form action="/cgi-bin/koha/admin/edi_accounts.pl" name="Actform" method="post">
     [% INCLUDE 'csrf-token.inc' %]
-  <input type="hidden" name="op-cud" value="save" />
+  <input type="hidden" name="op" value="cud-save" />
   [% IF account %]
   <input type="hidden" name="id" value="[% account.id | html %]" />
   [% END %]
@@ -285,7 +285,7 @@
     [% INCLUDE 'csrf-token.inc' %]
     <table>
     </table>
-    <input type="hidden" name="op-cud" value="delete_confirmed" />
+    <input type="hidden" name="op" value="cud-delete_confirmed" />
     <input type="hidden" name="id" value="[% account.id | html %]" />
     <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
index 5fbc4465e0..9b92ab4c81 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
@@ -85,7 +85,7 @@
 [% IF ean_form %]
 <form action="/cgi-bin/koha/admin/edi_ean_accounts.pl" name="Eanform" method="post">
     [% INCLUDE 'csrf-token.inc' %]
-  <input type="hidden" name="op-cud" value="save" />
+  <input type="hidden" name="op" value="cud-save" />
   [% IF ean %]
       <input type="hidden" name="oldbranchcode" value="[% ean.branch.branchcode | html %]" />
       <input type="hidden" name="id" value="[% ean.id | html %]" />
@@ -162,7 +162,7 @@
 
 <form action="/cgi-bin/koha/admin/edi_ean_accounts.pl" method="post">
     [% INCLUDE 'csrf-token.inc' %]
-    <input type="hidden" name="op-cud" value="delete_confirmed" />
+    <input type="hidden" name="op" value="cud-delete_confirmed" />
     <input type="hidden" name="id" value="[% ean.id | html %]" />
     <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt
index 43ff1d5d61..ebba130929 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt
@@ -88,7 +88,7 @@
 
         <form action="/cgi-bin/koha/admin/identity_providers.pl" id="add" name="add" class="validated" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="add" />
+            <input type="hidden" name="op" value="cud-add" />
             <input type="hidden" name="domain_ops" value="1" />
             <input type="hidden" name="identity_provider_id" value="[%- identity_provider_id | html -%]" />
             <fieldset class="rows">
@@ -170,7 +170,7 @@
 
         <form action="/cgi-bin/koha/admin/identity_providers.pl" id="edit_save" name="edit_save" class="validated" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="edit_save" />
+            <input type="hidden" name="op" value="cud-edit_save" />
             <input type="hidden" name="domain_ops" value="1" />
             <input type="hidden" name="identity_provider_id" value="[%- identity_provider_id | html -%]" />
             <input type="hidden" name="identity_provider_domain_id" value="[%- identity_provider_domain.identity_provider_domain_id | html -%]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt
index 2d7ebd946b..b45c266356 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt
@@ -84,7 +84,7 @@
 
         <form action="/cgi-bin/koha/admin/identity_providers.pl" id="add" name="add" class="validated" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="add" />
+            <input type="hidden" name="op" value="cud-add" />
             <fieldset class="rows">
                 <legend id="identity_provider_basic">Basic configuration</legend>
                 <ol>
@@ -239,7 +239,7 @@
 
         <form action="/cgi-bin/koha/admin/identity_providers.pl" id="edit_save" name="edit_save" class="validated" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="edit_save" />
+            <input type="hidden" name="op" value="cud-edit_save" />
             <input type="hidden" name="identity_provider_id" value="[%- identity_provider.identity_provider_id | html -%]" />
             <fieldset class="rows">
                 <legend id="identity_provider_basic">Basic configuration</legend>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt
index 6b77acbf96..290cdb884e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt
@@ -75,7 +75,7 @@
 
                     <form action="/cgi-bin/koha/admin/ill_batch_statuses.pl" name="Aform" method="post" class="validated">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="add_validate" />
+                        <input type="hidden" name="op" value="cud-add_validate" />
                         <fieldset class="rows">
                             <ol>
                                 <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
index 13d59bc63d..ab9feb1c01 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
@@ -63,9 +63,9 @@
                         <fieldset class="rows">
                             [% INCLUDE 'admin-items-search-field-form.inc' field=field %]
                             [% IF (field) %]
-                                <input type="hidden" name="op-cud" value="mod" />
+                                <input type="hidden" name="op" value="cud-mod" />
                             [% ELSE %]
-                                <input type="hidden" name="op-cud" value="add" />
+                                <input type="hidden" name="op" value="cud-add" />
                             [% END %]
                         </fieldset>
                         <fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
index 99c60d123b..adeeb6865c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
@@ -151,7 +151,7 @@
     [% END %]
     <form action="/cgi-bin/koha/admin/itemtypes.pl" name="Aform" method="post" id="itemtypeentry">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="add_validate" />
+        <input type="hidden" name="op" value="cud-add_validate" />
         <fieldset class="rows">
             <ol>
                 [% IF itemtype %]
@@ -376,7 +376,7 @@
         </table>
         <form action="/cgi-bin/koha/admin/itemtypes.pl" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="delete_confirmed" /><input type="hidden" name="itemtype" value="[% itemtype.itemtype | html %]" />
+            <input type="hidden" name="op" value="cud-delete_confirmed" /><input type="hidden" name="itemtype" value="[% itemtype.itemtype | html %]" />
             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this item type</button>
         </form>
         <form action="/cgi-bin/koha/admin/itemtypes.pl" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
index dfa395538a..5d1db7dfca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
@@ -290,7 +290,7 @@
 
                 <form action="/cgi-bin/koha/admin/marc-overlay-rules.pl" method="post">
                     [% INCLUDE 'csrf-token.inc' %]
-                    <input type="hidden" name="op-cud" value="redo-matching" />
+                    <input type="hidden" name="op" value="cud-redo-matching" />
                 </form>
 
             </div><!-- /.col-sm-10.col-sm-push-2 -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
index 5189567986..024b626462 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
@@ -95,7 +95,7 @@
 
                         <form action="[% script_name | html %]" name="Aform" method="post">
                             [% INCLUDE 'csrf-token.inc' %]
-                            <input type="hidden" name="op-cud" value="add_validate" />
+                            <input type="hidden" name="op" value="cud-add_validate" />
                             <input type="hidden" name="tagfield" value="[% tagfield | html %]" />
                             <input type="hidden" name="frameworkcode" value="[% frameworkcode | html %]" />
 
@@ -321,7 +321,7 @@
                             <p>Subfield: [% mss.tagsubfield | html %]</p>
                             <p>Description: [% mss.liblibrarian | html_entity %]</p>
 
-                            <form action="[% delete_link | html %]" method="post"><input type="hidden" name="op-cud" value="delete_confirmed" />
+                            <form action="[% delete_link | html %]" method="post"><input type="hidden" name="op" value="cud-delete_confirmed" />
                                 [% INCLUDE 'csrf-token.inc' %]
                                 <input type="hidden" name="tagfield" value="[% mss.tagfield | html %]" />
                                 <input type="hidden" name="tagsubfield" value="[% mss.tagsubfield | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
index dc3fd340c1..d3c54b1787 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
@@ -136,7 +136,7 @@
                     <input type="hidden" name="modif" value="1" />
                 [% END %]
             </legend>
-            <input type="hidden" name="op-cud" value="add_validate" />
+            <input type="hidden" name="op" value="cud-add_validate" />
             <input type="hidden" name="frameworkcode" value="[% framework.frameworkcode | html %]" />
         <ol>
             <li>
@@ -201,7 +201,7 @@
         <p>Description: [% liblibrarian | html %]</p>
         <form action="[% script_name | html %]" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="delete_confirmed" />
+            <input type="hidden" name="op" value="cud-delete_confirmed" />
             <input type="hidden" name="searchfield" value="[% searchfield | html %]" />
             <input type="hidden" name="frameworkcode" value="[% framework.frameworkcode | html %]" />
             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this tag</button>
@@ -224,7 +224,7 @@
 
     <form action="[% script_name | html %]" method="post">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="framework_create_confirm" />
+        <input type="hidden" name="op" value="cud-framework_create_confirm" />
         <input type="hidden" name="frameworkcode" value="[% framework.frameworkcode | html %]" />
         Create framework for [% framework.frameworkcode | html %] ([% framework.frameworktext | html %]) using
         <select name="existingframeworkcode">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
index de79574ba6..531163d1b7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
@@ -115,7 +115,7 @@
                     [% END %]
                     <form action="[% script_name | html %]" name="Aform" method="post">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="[% confirm_op | html %]" />
+                        <input type="hidden" name="op" value="cud-[% confirm_op | html %]" />
                         <fieldset class="rows">
                             <ol>
                                 <li>
@@ -430,7 +430,7 @@
                         <h1>Confirm deletion of record matching rule <span class="ex">'[% code | html %]' ([% description | html %])</span>?</h1>
                         <form action="[% script_name | html %]" name="Aform" method="post">
                             [% INCLUDE 'csrf-token.inc' %]
-                            <input type="hidden" name="op-cud" value="[% confirm_op | html %]" />
+                            <input type="hidden" name="op" value="cud-[% confirm_op | html %]" />
                             <input type="hidden" name="matcher_id" value="[% matcher_id | html %]" />
                             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete record matching rule</button>
                         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
index 2fad0b6860..67ac3c0ff9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
@@ -133,7 +133,7 @@
                     </tbody>
                 </table>
                 <input type="hidden" name="id" value="[% id | html %]" />
-                <input type="hidden" name="op-cud" value="save" />
+                <input type="hidden" name="op" value="cud-save" />
             </div> <!-- /.page-section -->
             <fieldset class="action">
                 <input type="submit" class="btn btn-primary" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">Cancel</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
index acdbbfe764..f258097c41 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
@@ -62,10 +62,10 @@
                 [% INCLUDE 'csrf-token.inc' %]
             [% IF ( op_new ) %]
                 <h1>New OAI set</h1>
-                <input type="hidden" name="op-cud" value="savenew" />
+                <input type="hidden" name="op" value="cud-savenew" />
             [% ELSIF ( op_mod ) %]
                 <h1>[% tx("Modify OAI set '{oai_set}'", { oai_set = spec }) | html %]</h1>
-                    <input type="hidden" name="op-cud" value="savemod" />
+                    <input type="hidden" name="op" value="cud-savemod" />
                     <input type="hidden" name="id" value="[% id | html %]" />
             [% END %]
                 <fieldset id="oaidetails" class="rows">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
index 13ae08dfa4..9ac74363c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
@@ -40,7 +40,7 @@
 
                 <form action="/cgi-bin/koha/admin/overdrive.pl" name="overdrive_form" method="post" class="validated">
                     [% INCLUDE 'csrf-token.inc' %]
-                    <input type="hidden" name="op-cud" value="update" />
+                    <input type="hidden" name="op" value="cud-update" />
                     <fieldset>
                         <table id="od_info">
                             <thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
index 64754f555d..f13b51a1a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
@@ -87,7 +87,7 @@
 [% END %]
 <form action="[% script_name | html %]" class="validated" method="post">
     [% INCLUDE 'csrf-token.inc' %]
-  <input type="hidden" name="op-cud" value="[% confirm_op | html %]" />
+  <input type="hidden" name="op" value="cud-[% confirm_op | html %]" />
   <fieldset class="rows">
     <ol>
       <li>
@@ -268,7 +268,7 @@
         </h1>
         <form action="[% script_name | html %]" name="Aform" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="[% confirm_op | html %]" />
+            <input type="hidden" name="op" value="cud-[% confirm_op | html %]" />
             <input type="hidden" name="code" value="[% code | html %]" />
             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete patron attribute type</button>
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
index ff20307079..727d866888 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
@@ -61,7 +61,7 @@
     <form action="/cgi-bin/koha/admin/preferences.pl" method="post">
         [% INCLUDE 'csrf-token.inc' %]
         [% UNLESS ( searchfield ) %]<div id="toolbar"><button class="save-all btn btn-primary" type="submit">Save all [% TAB.tab_title | html %] preferences</button></div>[% END %]
-        <input type="hidden" name="op-cud" value="save" />
+        <input type="hidden" name="op" value="cud-save" />
         <input type="hidden" name="tab" value="[% TAB.tab_id | html %]" />
 
             [% FOREACH LINE IN TAB.LINES %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
index b5c01eba6d..fd2910d8e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
@@ -95,7 +95,7 @@
 [% IF op == 'add_form' %]
     <form id="restriction_form" action="/cgi-bin/koha/admin/restrictions.pl" method="post">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="add_validate" />
+        <input type="hidden" name="op" value="cud-add_validate" />
         <input type="hidden" name="checked" value="0" />
         [% IF restriction %]
             <h1>Modify restriction type '[% PROCESS restriction_type_description restriction_type=restriction %]'</h1>
@@ -170,7 +170,7 @@
         <p>Are you sure you want to delete '[% PROCESS restriction_type_description restriction_type=restriction %]'?</p>
         <form action="/cgi-bin/koha/admin/restrictions.pl" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="delete_confirmed" />
+            <input type="hidden" name="op" value="cud-delete_confirmed" />
             <input type="hidden" name="code" value="[% restriction.code | html %]" />
             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
index 57fa4be304..cd6dc0dd9f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
@@ -92,7 +92,7 @@ a.add, a.delete {
             <h3>The current mappings you see on the screen will be erased and replaced by the mappings in the mappings.yaml file.</h3>
             <form method="post">
                 [% INCLUDE 'csrf-token.inc' %]
-                <input type="hidden" name="op-cud" value="reset_confirmed" />
+                <input type="hidden" name="op" value="cud-reset_confirmed" />
                 <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, reset mappings</button>
             </form>
 
@@ -505,8 +505,8 @@ a.add, a.delete {
         [% END # /WRAPPER tabs %]
 
         <fieldset class="action">
-            <button class="btn btn-primary" type="submit" name="op-cud" value="edit"><i class="fa-solid fa-hard-drive" aria-hidden="true"></i> Save</button>
-            <button class="btn btn-default" type="submit" name="op-cud" value="reset_confirm"><i class="fa-solid fa-rotate" aria-hidden="true"></i> Reset mappings</button>
+            <button class="btn btn-primary" type="submit" name="op" value="cud-edit"><i class="fa-solid fa-hard-drive" aria-hidden="true"></i> Save</button>
+            <button class="btn btn-default" type="submit" name="op" value="cud-reset_confirm"><i class="fa-solid fa-rotate" aria-hidden="true"></i> Reset mappings</button>
         </fieldset>
     </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
index 93bfddfee2..610104f29a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
@@ -105,7 +105,7 @@
                             </ol>
                         </fieldset>
                         <fieldset class="action">
-                            <input type="hidden" name="op-cud" value="save" />
+                            <input type="hidden" name="op" value="cud-save" />
                             <input type="submit" class="btn btn-primary" value="Save" />
                         </fieldset>
                     </form>
@@ -130,7 +130,7 @@
                                 </ol>
                             </fieldset>
                             <fieldset class="action">
-                                <input type="hidden" name="op-cud" value="reset" />
+                                <input type="hidden" name="op" value="cud-reset" />
                                 <input type="submit" class="btn btn-primary" value="Reset your token" />
                             </fieldset>
                         </form>
@@ -151,7 +151,7 @@
                                 </ol>
                             </fieldset>
                             <fieldset class="action">
-                                <input type="hidden" name="op-cud" value="send" />
+                                <input type="hidden" name="op" value="cud-send" />
                                 <input type="submit" class="btn btn-primary" value="Send to Mana KB" />
                             </fieldset>
                         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index ecb53ed6e5..74127eb602 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -107,7 +107,7 @@
                 <div class="page-section">
                     <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="add" />
+                        <input type="hidden" name="op" value="cud-add" />
                         <input type="hidden" name="branch" value="[% current_branch | html %]"/>
                         <table id="default-circulation-rules">
                         <thead>
@@ -624,7 +624,7 @@
                     <p>You can set a default maximum number of checkouts, hold policy and return policy that will be used if none is defined below for a particular item type or category.</p>
                     <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="set-branch-defaults" />
+                        <input type="hidden" name="op" value="cud-set-branch-defaults" />
                         <input type="hidden" name="branch" value="[% current_branch | html %]"/>
                         <table>
                             <tr>
@@ -819,7 +819,7 @@
                     </p>
                     <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="add-branch-cat" />
+                        <input type="hidden" name="op" value="cud-add-branch-cat" />
                         <input type="hidden" name="branch" value="[% current_branch | html %]"/>
                         <table>
                             <tr>
@@ -899,7 +899,7 @@
                     <p>Specify if waiting holds can be cancelled for a given patron category.</p>
                     <form id="set-waiting-hold-cancellation" method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="set-waiting-hold-cancellation" />
+                        <input type="hidden" name="op" value="cud-set-waiting-hold-cancellation" />
                         <input type="hidden" name="branch" value="[% current_branch | html %]"/>
                         <table>
                             <tr>
@@ -984,7 +984,7 @@
                     <p>Specify the maximum number simultaneous current article requests a patron of a given category can have.</p>
                     <form id="set-article-requests-daily-limit" method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="add-open-article-requests-limit" />
+                        <input type="hidden" name="op" value="cud-add-open-article-requests-limit" />
                         <input type="hidden" name="branch" value="[% current_branch | html %]"/>
                         <table>
                             <tr>
@@ -1039,7 +1039,7 @@
                     <p>Specify the article request fee for a given patron category.</p>
                     <form id="set-article-request-fee" method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="set-article-request-fee" />
+                        <input type="hidden" name="op" value="cud-set-article-request-fee" />
                         <input type="hidden" name="branch" value="[% current_branch | html %]"/>
                         <table>
                             <tr>
@@ -1100,7 +1100,7 @@
                     <p>Specify the default policy for lost item fees on return.</p>
                     <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="mod-refund-lost-item-fee-rule" />
+                        <input type="hidden" name="op" value="cud-mod-refund-lost-item-fee-rule" />
                         <input type="hidden" name="branch" value="[% current_branch | html %]" />
                         <table>
                             <tr>
@@ -1303,7 +1303,7 @@
 
                     <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="add-branch-item" />
+                        <input type="hidden" name="op" value="cud-add-branch-item" />
                         <input type="hidden" name="branch" value="[% current_branch | html %]"/>
                         <table>
                             <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
index 0921aa9e16..8b84d823a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
@@ -84,7 +84,7 @@
                         <fieldset class="rows">
                             <legend>Add an SMS cellular provider</legend>
                             <input type="hidden" id="id" name="id" value="" />
-                            <input type="hidden" id="op" name="op-cud" value="add_update" />
+                            <input type="hidden" id="op" name="op" value="cud-add_update" />
                             <ol>
                                 <li>
                                     <label for="name" class="required">Name: </label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
index dd1b89d53d..f57a4f6d6b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
@@ -81,7 +81,7 @@
     <h1>New SMTP server</h1>
     <form action="/cgi-bin/koha/admin/smtp_servers.pl" id="add" name="add" class="validated" method="post">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="add" />
+        <input type="hidden" name="op" value="cud-add" />
         <fieldset class="rows">
             <ol>
                 <li>
@@ -155,7 +155,7 @@
 
     <form action="/cgi-bin/koha/admin/smtp_servers.pl" id="edit_save" name="edit_save" class="validated" method="post">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="edit_save" />
+        <input type="hidden" name="op" value="cud-edit_save" />
         <input type="hidden" name="smtp_server_id" value="[%- smtp_server.id | html -%]" />
         <fieldset class="rows">
             <ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
index 4153289095..7b85e550a2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
@@ -101,7 +101,7 @@
         <fieldset class="rows">
             <legend class="sr-only">System preference details</legend>
             <ol>
-            <li><label for="explanation">Explanation: </label><input type="text" name="explanation" id="explanation" size="60" value="[% explanation | html %]" /><input type="hidden" name="op-cud" value="add_validate" /></li>
+            <li><label for="explanation">Explanation: </label><input type="text" name="explanation" id="explanation" size="60" value="cud-[% explanation | html %]" /><input type="hidden" name="op" value="add_validate" /></li>
             <li>[% IF ( searchfield ) %]<span class="label">Variable: </span>[% searchfield | html %]<input type="hidden" name="variable" value="[% searchfield | html %]" />
             [% ELSE %]<label for="variable">Variable: </label><input type="text" name="variable" id="variable" size="60" />[% END %]</li>
             <li><label for="value">Value: </label>
@@ -284,7 +284,7 @@
             </table>
             <form class="inline" action="[% script_name | html %]" method="post">
                 [% INCLUDE 'csrf-token.inc' %]
-                <input type="hidden" name="op-cud" value="delete_confirmed" />
+                <input type="hidden" name="op" value="cud-delete_confirmed" />
                 <input type="hidden" name="searchfield" value="[% searchfield | html %]" />
                 <input type="hidden" name="Tvalue" value="[% Tvalue | html %]" />
                 <button type="submit" class="approve"><i class="fa fa-check" aria-hidden="true"></i> Yes, delete</button>
@@ -430,7 +430,7 @@
                     [% END %]
                     <label for="value-no" class="yesno">OFF</label>
                 [% END %]
-                <input type="hidden" name="op-cud" value="add_validate" />
+                <input type="hidden" name="op" value="cud-add_validate" />
                 <input type="hidden" name="variable" value="[% loo.variable | html %]" />
                 <input type="hidden" name="prefoptions" value="[% loo.prefoptions | html %]" />
                 <input type="hidden" name="preftype" value="[% loo.type | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
index bb4cbc6bb2..b84e41c76e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
@@ -57,7 +57,7 @@
 
         <form method="post" action="/cgi-bin/koha/admin/transport-cost-matrix.pl" id="cost_matrix_form">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="set-cost-matrix" />
+            <input type="hidden" name="op" value="cud-set-cost-matrix" />
             <fieldset id="transport-cost-matrix">
                 <div class="help">
                     <p>Costs are decimal values between some arbitrary maximum value (e.g. 1 or 100) and 0 which is the minimum (no) cost.</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
index 978755f732..bcc50b0052 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
@@ -247,7 +247,7 @@
         </div>
 
         <fieldset class="action">
-            <input type="hidden" name="op-cud" value="update" />
+            <input type="hidden" name="op" value="cud-update" />
             <input type="submit" class="btn btn-primary" value="Update your statistics usage" />
             <a class="cancel" href="/cgi-bin/koha/admin/usage_statistics.pl">Cancel</a>
         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
index e4c6c66a22..ab0c9b1d22 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
@@ -91,7 +91,7 @@
             <h1>[% tx("New {servertype} server", { servertype = servertype }) | html %]</h1>
         [% END %]
 
-        <input type="hidden" name="op-cud" value="add_validated" />
+        <input type="hidden" name="op" value="cud-add_validated" />
         <input type="hidden" name="servertype" value="[% server.servertype||type||'zed' | html %]"/>
         <fieldset class="rows">
         <ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
index 8e8b31f835..c20b63d261 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
@@ -431,7 +431,7 @@
 
                 <form method="post" id="f" name="f" action="/cgi-bin/koha/authorities/authorities.pl">
                     [% INCLUDE 'csrf-token.inc' %]
-                    <input type="hidden" name="op-cud" value="add" />
+                    <input type="hidden" name="op" value="cud-add" />
                     <input type="hidden" name="addfield_field" value="" />
                     <input type="hidden" name="repeat_field" value="" />
                     <input type="hidden" name="authtypecode" value="[% authtypecode | html%]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
index 94808d917a..b3a89e508c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
@@ -281,7 +281,7 @@
 
         <form method="POST" action="/cgi-bin/koha/tools/batchMod.pl" id="batch_item_operations">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="show" />
+            <input type="hidden" name="op" value="cud-show" />
             <input type="hidden" id="batch_mod_del" name="del" value="0" />
         </form>
 
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 626d4c6f2e..a00db538ac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -235,7 +235,7 @@
                                                             <input type="submit" name="submit" class="submit" value="Set status" disabled="disabled"/>
                                                             <p class="help-block">Item has been claimed as returned.</p>
                                                         [% ELSE %]
-                                                            <input type="hidden" name="op-cud" value="set_lost" />
+                                                            <input type="hidden" name="op" value="cud-set_lost" />
                                                             <input type="submit" name="submit" class="btn btn-primary btn-xs" value="Set status" />
                                                         [% END %]
                                                     </form>
@@ -271,7 +271,7 @@
                                                                 [% END %]
                                                             [% END %]
                                                         </select>
-                                                        <input type="hidden" name="op-cud" value="set_damaged" />
+                                                        <input type="hidden" name="op" value="cud-set_damaged" />
                                                         <input type="submit" name="submit" class="btn btn-primary btn-xs" value="Set status" />
                                                     </form>
                                                 [% ELSE %]
@@ -306,7 +306,7 @@
                                                                 [% END %]
                                                             [% END %]
                                                         </select>
-                                                        <input type="hidden" name="op-cud" value="set_withdrawn" />
+                                                        <input type="hidden" name="op" value="cud-set_withdrawn" />
                                                         <input type="submit" name="submit" class="btn btn-primary btn-xs" value="Set status" />
                                                     </form>
                                                 [% ELSE %]
@@ -346,7 +346,7 @@
                                                         <option value="0" selected>No</option>
                                                     [% END %]
                                                 </select>
-                                                <input type="hidden" name="op-cud" value="set_exclude_priority" />
+                                                <input type="hidden" name="op" value="cud-set_exclude_priority" />
                                                 <input type="submit" name="submit" class="btn btn-primary btn-xs" value="Update" />
                                             </form>
                                         </li>
@@ -367,7 +367,7 @@
                                                         <option value="0" selected="selected">No</option>
                                                         [% END %]
                                                     </select>
-                                                    <input type="hidden" name="op-cud" value="set_bookable" />
+                                                    <input type="hidden" name="op" value="cud-set_bookable" />
                                                     <input type="submit" name="submit" class="btn btn-primary btn-xs" value="Update" />
                                                 </form>
                                             [% ELSE %]
@@ -474,7 +474,7 @@
                                                 <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber | html %]" />
                                                     [% INCLUDE 'csrf-token.inc' %]
                                                     <input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber | html %]" /><input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber | html %]" />
-                                                    <input type="hidden" name="op-cud" value="set_public_note" />
+                                                    <input type="hidden" name="op" value="cud-set_public_note" />
                                                     <textarea name="itemnotes" rows="2" cols="30">[% ITEM_DAT.itemnotes | html %]</textarea><input type="submit" name="submit" class="btn btn-primary btn-xs" value="Update" />
                                                 </form>
                                             [% ELSE %]
@@ -488,7 +488,7 @@
                                                 <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber | html %]" />
                                                     [% INCLUDE 'csrf-token.inc' %]
                                                     <input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber | html %]" /><input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber | html %]" />
-                                                    <input type="hidden" name="op-cud" value="set_non_public_note" />
+                                                    <input type="hidden" name="op" value="cud-set_non_public_note" />
                                                     <textarea name="itemnotes_nonpublic" rows="2" cols="30">[% ITEM_DAT.itemnotes_nonpublic | html %]</textarea><input type="submit" name="submit" class="btn btn-primary btn-xs" value="Update" />
                                                 </form>
                                             [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
index a86f0bd9ff..b1e9e7c9df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
@@ -148,7 +148,7 @@
                                                 [% END %]
                                             </select>
                                             <button class="btn btn-default btn-xs" type="submit"><i class="fa fa-plus"></i> Add to rota</button>
-                                            <input type="hidden" name="op-cud" value="add_item_to_rota" />
+                                            <input type="hidden" name="op" value="cud-add_item_to_rota" />
                                             <input type="hidden" name="item_id" value="[% item.bib_item.id | uri %]" />
                                             <input type="hidden" name="biblionumber" value="[% biblionumber | uri %]" />
                                         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index 92fe600188..669c751c15 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -1053,7 +1053,7 @@ $(document).ready(function(){
                 [% IF ( popup ) %]
                         <input type="hidden" name="mode" value="popup" />
                 [% END %]
-                <input type="hidden" name="op-cud" value="addbiblio" />
+                <input type="hidden" name="op" value="cud-addbiblio" />
                 <input type="hidden" id="frameworkcode" name="frameworkcode" value="[% frameworkcode | html %]" />
                 <input type="hidden" name="z3950" value="[% z3950 | html %]" />
                 <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 146ecbf393..0a402dc323 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -177,7 +177,7 @@
 <div id="cataloguing_additem_newitem" class="item_edit_form page-section">
     <form id="f" method="post" action="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblio.biblionumber | html %]" name="f">
         [% INCLUDE 'csrf-token.inc' %]
-    <input type="hidden" name="op-cud" value="[% op | html %]" />
+    <input type="hidden" name="op" value="cud-[% op | html %]" />
     [% IF (popup) %]
         <input type="hidden" name="popup" value="1" />
     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt
index 3f1c500508..0ba8002bea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt
@@ -28,7 +28,7 @@
                     <input type="hidden" name="plugin_name" value="marc21_linking_section.pl" />
                     <input type="hidden" name="index" value="[% index | html %]" />
                     <input type="hidden" name="result" value="marc12 field 7 [% index | html %]" />
-                    <input type="hidden" name="op-cud" value="do_search" />
+                    <input type="hidden" name="op" value="cud-do_search" />
                     <label class="label100" for="searchbox">Any word</label>
                     <input type="text" name="search" id="searchbox" size="35" /><br />
                     <label for="itypeloop">Item type</label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
index 9c96c14f05..0673054197 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
@@ -18,7 +18,7 @@
             [% INCLUDE 'csrf-token.inc' %]
         <fieldset class="rows">
             <input type="hidden" name="plugin_name" value="unimarc_field_210c.pl" />
-            <input type="hidden" name="op-cud" value="do_search" />
+            <input type="hidden" name="op" value="cud-do_search" />
             <input type="hidden" name="type" value="intranet" />
             <input type="hidden" name="nbstatements" value="[% nbstatements | html %]" />
             <input type="hidden" name="index" value="[% index | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
index 18f7902c1a..68be8d1342 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
@@ -25,7 +25,7 @@
                         <input type="hidden" name="plugin_name" value="unimarc_field_4XX.pl" />
                         <input type="hidden" name="index" value="[% index | html %]" />
                         <input type="hidden" name="result" value="unimarc field 4 [% index | html %]" />
-                        <input type="hidden" name="op-cud" value="do_search" />
+                        <input type="hidden" name="op" value="cud-do_search" />
                         <label class="label100" for="searchbox">Any word</label>
                         <input type="text" name="search" id="searchbox" size="35" /><br />
                         <label for="itypeloop">Item type:</label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
index 586ec4773b..5ff8d26afd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
@@ -24,7 +24,7 @@
         <h1>Z39.50 authority search points</h1>
         <form method="post" action="z3950_auth_search.pl" name="f" class="checkboxed">
             [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" id="op" value="do_search" />
+        <input type="hidden" name="op" id="op" value="cud-do_search" />
         <input type="hidden" name="authid" value="[% authid | html %]" />
         <input type="hidden" name="index" value="[% index | html %]" />
             <div class="row">
@@ -140,7 +140,7 @@
 
     <form method="post" action="z3950_auth_search.pl" id="page_form" name="page_form" class="checkboxed">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" id="op" value="do_search" />
+        <input type="hidden" name="op" id="op" value="cud-do_search" />
         <input type="hidden" name="current_page" id="current_page" value="[% current_page | html %]" />
         <input type="hidden" id="nameany"  name="nameany" value="[% nameany | html %]" />
         <input type="hidden" id="authorany"  name="authorany" value="[% authorany | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
index aa118af5bd..d6b35e41b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
@@ -45,7 +45,7 @@
                 [% INCLUDE 'csrf-token.inc' %]
                 <div class="row">
                     <div class="col-xs-6">
-                        <input type="hidden" name="op-cud" id="op" value="do_search" />
+                        <input type="hidden" name="op" id="op" value="cud-do_search" />
                         <fieldset class="rows">
                             <ol>
                                 <li>
@@ -227,7 +227,7 @@
 
                             <form method="post" action="z3950_search.pl" id="page_form" name="page_form" class="checkboxed">
                                 [% INCLUDE 'csrf-token.inc' %]
-                                <input type="hidden" name="op-cud" id="op" value="do_search" />
+                                <input type="hidden" name="op" id="op" value="cud-do_search" />
                                 <input type="hidden" name="current_page" id="current_page" value="[% current_page | html %]" />
                                 <input type="hidden" id="title"  name="title" value="[% title | html %]" />
                                 <input type="hidden" id="isbn" name="isbn" value="[% isbn | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
index 5c4453f2cf..2b72b6730c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
@@ -121,7 +121,7 @@
             </fieldset>
        [% END %]
 
-      <input type="hidden" name="op-cud" value="show" />
+      <input type="hidden" name="op" value="cud-show" />
     </div>
 
     <fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
index 1c51231daa..3382d6a634 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
@@ -218,7 +218,7 @@
                                                     <td>
                                                         <form method="post" class="form">
                                                             [% INCLUDE 'csrf-token.inc' %]
-                                                            <input type="hidden" name="op-cud" value="mark-as-staged"/>
+                                                            <input type="hidden" name="op" value="cud-mark-as-staged"/>
                                                             <input type="hidden" name="tab" value="to-be-staged"/>
                                                             <input type="hidden" name="id" value="[% cp.id | html %]"/>
                                                             <p>
@@ -228,7 +228,7 @@
 
                                                         <form method="post" class="form">
                                                             [% INCLUDE 'csrf-token.inc' %]
-                                                            <input type="hidden" name="op-cud" value="cancel"/>
+                                                            <input type="hidden" name="op" value="cud-cancel"/>
                                                             <input type="hidden" name="tab" value="to-be-staged"/>
                                                             <input type="hidden" name="id" value="[% cp.id | html %]"/>
                                                             <p>
@@ -279,7 +279,7 @@
                                                     <td>
                                                         <form method="post" class="form">
                                                             [% INCLUDE 'csrf-token.inc' %]
-                                                            <input type="hidden" name="op-cud" value="mark-patron-has-arrived"/>
+                                                            <input type="hidden" name="op" value="cud-mark-patron-has-arrived"/>
                                                             <input type="hidden" name="tab" value="staged-and-ready"/>
                                                             <input type="hidden" name="id" value="[% cp.id | html %]"/>
                                                             <p>
@@ -289,7 +289,7 @@
 
                                                         <form method="post" class="form">
                                                             [% INCLUDE 'csrf-token.inc' %]
-                                                            <input type="hidden" name="op-cud" value="mark-as-delivered"/>
+                                                            <input type="hidden" name="op" value="cud-mark-as-delivered"/>
                                                             <input type="hidden" name="tab" value="staged-and-ready"/>
                                                             <input type="hidden" name="id" value="[% cp.id | html %]"/>
                                                             <p>
@@ -299,7 +299,7 @@
 
                                                         <form method="post" class="form">
                                                             [% INCLUDE 'csrf-token.inc' %]
-                                                            <input type="hidden" name="op-cud" value="mark-as-unstaged"/>
+                                                            <input type="hidden" name="op" value="cud-mark-as-unstaged"/>
                                                             <input type="hidden" name="tab" value="staged-and-ready"/>
                                                             <input type="hidden" name="id" value="[% cp.id | html %]"/>
                                                             <p>
@@ -350,7 +350,7 @@
                                                     <td>
                                                         <form method="post" class="form">
                                                             [% INCLUDE 'csrf-token.inc' %]
-                                                            <input type="hidden" name="op-cud" value="mark-as-delivered"/>
+                                                            <input type="hidden" name="op" value="cud-mark-as-delivered"/>
                                                             <input type="hidden" name="tab" value="patron-is-outside"/>
                                                             <input type="hidden" name="id" value="[% cp.id | html %]"/>
                                                             <p>
@@ -360,7 +360,7 @@
 
                                                         <form method="post" class="form">
                                                             [% INCLUDE 'csrf-token.inc' %]
-                                                            <input type="hidden" name="op-cud" value="mark-as-staged"/>
+                                                            <input type="hidden" name="op" value="cud-mark-as-staged"/>
                                                             <input type="hidden" name="tab" value="patron-is-outside"/>
                                                             <input type="hidden" name="id" value="[% cp.id | html %]"/>
                                                             <p>
@@ -370,7 +370,7 @@
 
                                                         <form method="post" class="form">
                                                             [% INCLUDE 'csrf-token.inc' %]
-                                                            <input type="hidden" name="op-cud" value="mark-as-unstaged"/>
+                                                            <input type="hidden" name="op" value="cud-mark-as-unstaged"/>
                                                             <input type="hidden" name="tab" value="patron-is-outside"/>
                                                             <input type="hidden" name="id" value="[% cp.id | html %]"/>
                                                             <p>
@@ -452,7 +452,7 @@
                                     [% INCLUDE 'csrf-token.inc' %]
                                     <fieldset class="rows" style="float: none;">
                                         <input type="hidden" name="borrowernumber" value="[% patron.id | html %]"/>
-                                        <input type="hidden" name="op-cud" value="create-pickup"/>
+                                        <input type="hidden" name="op" value="cud-create-pickup"/>
                                         <input type="hidden" name="tab" value="schedule-pickup"/>
                                         <ol>
                                             <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
index 7e7862708f..908d981000 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
@@ -276,7 +276,7 @@
    </fieldset>
     <fieldset class="action">
         <input type="submit" class="btn btn-primary" value="Apply filter" />
-        <input type="hidden" name="op-cud" value="apply filter" />
+        <input type="hidden" name="op" value="cud-apply filter" />
     </fieldset>
   </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
index de4b7e3ffd..8709b5bf07 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -207,7 +207,7 @@
         <td>
             <form name="cancelReserve" action="/cgi-bin/koha/circ/pendingreserves.pl" method="post">
                 [% INCLUDE 'csrf-token.inc' %]
-                <input type="hidden" name="op-cud" value="cancel_reserve" />
+                <input type="hidden" name="op" value="cud-cancel_reserve" />
                 <input type="hidden" name="reserve_id" value="[% hold.reserve_id | html %]" />
 
                 [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
@@ -236,10 +236,10 @@
                     [% INCLUDE 'csrf-token.inc' %]
                     <input type="hidden" name="reserve_id" value="[% hold.reserve_id | html %]" />
                     [% IF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow' %]
-                        <input type="hidden" name="op-cud" value="mark_as_lost" />
+                        <input type="hidden" name="op" value="cud-mark_as_lost" />
                         <input type="submit" class="btn btn-primary" value="Mark item as lost" />
                     [% ELSIF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow_and_notify' %]
-                        <input type="hidden" name="op-cud" value="mark_as_lost_and_notify" />
+                        <input type="hidden" name="op" value="cud-mark_as_lost_and_notify" />
                         <input type="submit" class="btn btn-primary" value="Mark lost and notify patron" />
                     [% END %]
                 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
index affd1612c1..917490a685 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
@@ -86,7 +86,7 @@
                     <form name="frameworkselection" method="post" action="install.pl">
                         [% INCLUDE 'csrf-token.inc' %]
                         <input type="hidden" name="step" value="3" />
-                        <input type="hidden" name="op-cud" value="selectframeworks" />
+                        <input type="hidden" name="op" value="cud-selectframeworks" />
 
                         <p>MARC stands for Machine Readable Cataloging. A MARC record contains bibliographic record information about an item. MARC21 is used globally, UNIMARC tends to be used in a few European countries. </p>
 
@@ -126,7 +126,7 @@
                     <form name="frameworkselection" method="post" action="install.pl">
                         [% INCLUDE 'csrf-token.inc' %]
                         <input type="hidden" name="step" value="3" />
-                        <input type="hidden" name="op-cud" value="addframeworks" />
+                        <input type="hidden" name="op" value="cud-addframeworks" />
                         [% IF ( frameworksloop ) %]
                             <h3>MARC frameworks: [% marcflavour | html %]</h3>
                             [% IF ( en_marc_frameworks ) %]
@@ -263,7 +263,7 @@
                         </p>
 
                         <input type="hidden" name="step" value="3" />
-                        <input type="hidden" name="op-cud" value="finish" />
+                        <input type="hidden" name="op" value="cud-finish" />
                         <p>
                             <input value="Set up some of Koha's basic requirements" class="btn btn-primary" type="submit" />
                         </p>
@@ -317,7 +317,7 @@
                     <form action="install.pl" method="post">
                         [% INCLUDE 'csrf-token.inc' %]
                         <input type="hidden" name="step" value="3" />
-                        <input type="hidden" name="op-cud" value="importdatastructure" />
+                        <input type="hidden" name="op" value="cud-importdatastructure" />
                         <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
                     </form>
                 [% END # / proposeimport %]
@@ -345,7 +345,7 @@
                         <form action="install.pl" method="post">
                             [% INCLUDE 'csrf-token.inc' %]
                             <input type="hidden" name="step" value="3" />
-                            <input type="hidden" name="op-cud" value="choosemarc" />
+                            <input type="hidden" name="op" value="cud-choosemarc" />
                             <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
                         </form>
                     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt
index 61ec068e06..ffa8ea0e89 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt
@@ -7,7 +7,7 @@
 
 <form name="f" method="post">
     [% INCLUDE 'csrf-token.inc' %]
-	<input type="hidden" name="op-cud" value="do_search" />
+	<input type="hidden" name="op" value="cud-do_search" />
 	<input type="hidden" name="type" value="intranet" />
 	<div class="details">
 		<h2>Search on</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
index bf7cb33be5..1d8acdecdf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
@@ -94,7 +94,7 @@
                                 <div>
                                     <fieldset class="rows" style="border-bottom: 0px; border: 0px;">
                                     <ol><li id="description">
-                                            <input type="hidden" name="op-cud" value="add" />
+                                            <input type="hidden" name="op" value="cud-add" />
                                             <input type="hidden" name="batch_id" value="[% batch_id | html %]" />
                                             <label for="description">Batch description: </label>
                                             <input type="text" name="description" value="[% description | html %]"> <span id="change-status"></span>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt
index 3ac46b5657..feb837db1c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt
@@ -39,7 +39,7 @@
                     <h1>Print barcode range</h1>
                     <form name="add_by_number" action="/cgi-bin/koha/labels/label-edit-batch.pl" method="post">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="add" />
+                        <input type="hidden" name="op" value="cud-add" />
                         <fieldset class="rows">
                             <ol>
                                 <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
index 3801e3b6bb..2603ea9bb6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
@@ -73,7 +73,7 @@
             </h3>
             <form name="exporting" method="post" action="/cgi-bin/koha/labels/label-print.pl">
                 [% INCLUDE 'csrf-token.inc' %]
-                <input type="hidden" name="op-cud" value="export" />
+                <input type="hidden" name="op" value="cud-export" />
                 <input type="hidden" name="referer" value="[% referer | html %]" />
                 [% FOREACH batch_id IN batch_ids %]
                     <input type="hidden" name="batch_id" value="[% batch_id.batch_id | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
index f0dd292b47..37458f0f23 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
@@ -21,7 +21,7 @@
 
         <form name="f" method="post" action="/cgi-bin/koha/labels/label-item-search.pl">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="do_search" />
+            <input type="hidden" name="op" value="cud-do_search" />
             <input type="hidden" name="batch_id" value="[% batch_id | html %]" />
             <input type="hidden" name="type" value="[% type | html %]" />
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt
index 82f36a1f69..813a625e00 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt
@@ -64,7 +64,7 @@
                 <form id="add-api-key" action="/cgi-bin/koha/members/apikeys.pl" method="post" style="display:none">
                     <input type="hidden" name="patron_id" value="[% patron.id | html %]" />
                     [% INCLUDE 'csrf-token.inc' %]
-                    <input type="hidden" name="op-cud" value="generate" />
+                    <input type="hidden" name="op" value="cud-generate" />
                     <fieldset class="brief">
                         <legend>Generate new client id/secret pair</legend>
                         <ol>
@@ -103,7 +103,7 @@
                                                 <input type="hidden" name="patron_id" value="[% patron.id | html %]" />
                                                 <input type="hidden" name="key" value="[% key.id | html %]" />
                                                 [% INCLUDE 'csrf-token.inc' %]
-                                                <input type="hidden" name="op-cud" value="delete" />
+                                                <input type="hidden" name="op" value="cud-delete" />
                                                 <button class="btn btn-default btn-xs delete" type="submit"><i class="fa fa-trash-can"></i> Delete</button>
                                             </form>
                                             <form action="/cgi-bin/koha/members/apikeys.pl" method="post">
@@ -111,10 +111,10 @@
                                                 <input type="hidden" name="key" value="[% key.id | html %]" />
                                                 [% INCLUDE 'csrf-token.inc' %]
                                                 [% IF key.active %]
-                                                    <input type="hidden" name="op-cud" value="revoke" />
+                                                    <input type="hidden" name="op" value="cud-revoke" />
                                                     <button class="btn btn-default btn-xs" type="submit"><i class="fa fa-times"></i> Revoke</button>
                                                 [% ELSE %]
-                                                    <input type="hidden" name="op-cud" value="activate" />
+                                                    <input type="hidden" name="op" value="cud-activate" />
                                                     <button class="btn btn-default btn-xs" type="submit"><i class="fa fa-play"></i> Activate</button>
                                                 [% END %]
                                             </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
index 755d16e7d1..1756b41371 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
@@ -87,7 +87,7 @@
                     <fieldset class="rows">
                         <legend>Upload new file</legend>
                         <ol>
-                        <li><input type="hidden" name="op-cud" value="upload" />
+                        <li><input type="hidden" name="op" value="cud-upload" />
                         <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
                         <input type="hidden" name="MAX_FILE_SIZE" value="2000000" />
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index dd0cb71a4a..5baf5c5d84 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -115,7 +115,7 @@
         [% IF CAN_user_tools_edit_patrons %]
             <form id="patron_batchmod_form" method="post" action="/cgi-bin/koha/tools/modborrowers.pl">
                 [% INCLUDE 'csrf-token.inc' %]
-                <input type="hidden" name="op-cud" value="show" />
+                <input type="hidden" name="op" value="cud-show" />
                 <textarea style="display:none" id="borrowernumberlist" name="borrowernumberlist"></textarea>
             </form>
         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index e0661e3923..d5ed500f60 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -254,11 +254,11 @@ legend:hover {
                                 <input type="hidden" name="step"  value="[% step | html %]" />
                             [% END %]
                             [% IF ( opadd ) %]
-                                <input type="hidden" name="op-cud" value="insert" />
+                                <input type="hidden" name="op" value="cud-insert" />
                             [% ELSIF ( opduplicate ) %]
-                                <input type="hidden" name="op-cud" value="insert" />
+                                <input type="hidden" name="op" value="cud-insert" />
                             [% ELSE %]
-                                <input type="hidden" name="op-cud" value="save" />
+                                <input type="hidden" name="op" value="cud-save" />
                                 [% IF step == 4 || step == 5 || step == 6 || step == 2 || step == 1 || step == 7 %]
                                     [%# Only put the card number if we arent showing it in the form later %]
                                     [% IF borrower_data.cardnumber %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
index b9ead9fd3c..7b2efaa703 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
@@ -90,7 +90,7 @@
                                                     <div class="notice">
                                                         <form id="resend_notice[% QUEUED_MESSAGE.message_id | html %]" action="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber | html %]" method="POST">
                                                             [% INCLUDE 'csrf-token.inc' %]
-                                                            <input type="hidden" name="op-cud" value="resend_notice" />
+                                                            <input type="hidden" name="op" value="cud-resend_notice" />
                                                             <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
                                                             <input type="hidden" name="message_id" value="[% QUEUED_MESSAGE.message_id | html %]" />
                                                         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt
index 8cb99e83b5..1b181d1d51 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt
@@ -60,7 +60,7 @@
 
                             <form id="two-factor-auth" action="/cgi-bin/koha/members/two_factor_auth.pl" method="post">
                                 [% INCLUDE 'csrf-token.inc' %]
-                                <input type="hidden" name="op-cud" value="disable-2FA" />
+                                <input type="hidden" name="op" value="cud-disable-2FA" />
                                 <input type="submit" value="Disable two-factor authentication" />
                             </form>
                         </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
index 6ad1168e49..9f7e5e700c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
@@ -42,7 +42,7 @@
                         [% END %]
                     </tbody>
                 </table>
-                <input type="hidden" name="op-cud" value="update" />
+                <input type="hidden" name="op" value="cud-update" />
                 <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
                 <input type="hidden" name="cattype" value="[% cattype | html %]" />
                 <fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
index 2ab0fc5b74..620ffed2cd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
@@ -38,7 +38,7 @@
                     [% INCLUDE 'csrf-token.inc' %]
                     <fieldset class="rows" >
                         <input type="hidden" name="step" value="1"/>
-                        <input type="hidden" name="op-cud" value="add_validate_library"/>
+                        <input type="hidden" name="op" value="cud-add_validate_library"/>
                         <ol>
                             <li>
                                 <label for="branchcode" class="required">Library code: </label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
index fb6a066403..fff21ee2cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
@@ -50,7 +50,7 @@
                     [% INCLUDE 'csrf-token.inc' %]
                     <fieldset class="rows">
                         <input type="hidden" name="step" value="2" />
-                        <input type="hidden" name="op-cud" value="add_validate_category" />
+                        <input type="hidden" name="op" value="cud-add_validate_category" />
                         <ol>
                             <li>
                                 <label for="categorycode" class="required">Category code: </label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
index 023b8180eb..1f539a8ada 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
@@ -42,7 +42,7 @@
                     [% INCLUDE 'csrf-token.inc' %]
                     <fieldset class="rows">
                         <input type="hidden" name="step" value="3" />
-                        <input type="hidden" name="op-cud" value="add_validate_patron" />
+                        <input type="hidden" name="op" value="cud-add_validate_patron" />
                         <h3>Administrator identity</h3>
                         <ol>
                             <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
index f78197b174..287166f82a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
@@ -43,7 +43,7 @@
                         [% INCLUDE 'csrf-token.inc' %]
                     <fieldset class="rows">
                         <input type="hidden" name="step" value="4" />
-                        <input type="hidden" name="op-cud" value="add_validate_itemtype" />
+                        <input type="hidden" name="op" value="cud-add_validate_itemtype" />
                         <ol>
                             <li>
                                 <label for="itemtype" class="required">Item type code: </label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
index a4729fd368..3ae2065812 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
@@ -59,7 +59,7 @@
                         [% INCLUDE 'csrf-token.inc' %]
                         <fieldset class="rows">
                             <input type="hidden" name="step" value="5"/>
-                            <input type="hidden" name="op-cud" value="add_validate_circ_rule" />
+                            <input type="hidden" name="op" value="cud-add_validate_circ_rule" />
                             <ol>
                                 <li>
                                     <label for="branchname" class="required"> Library branch</label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
index 76c75eb978..af8b7c9ffb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
@@ -71,7 +71,7 @@
                                 <div>
                                     <fieldset class="rows" style="border-bottom: 0px; border: 0px;">
                                     <ol><li id="description">
-                                        <input type="hidden" name="op-cud" value="add" />
+                                        <input type="hidden" name="op" value="cud-add" />
                                         <input type="hidden" name="batch_id" value="[% batch_id | html %]" />
                                         <label for="description">Batch description: </label>
                                         <input type="text" name="description" value="[% description | html %]"> <span id="change-status"></span>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
index 8273990e79..d1c305cf6a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
@@ -490,7 +490,7 @@
                     <fieldset class="action">
                         <input class="btn btn-primary" type="submit" value="Save" />
                         <a class="cancel" href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Cancel</a>
-                        <input type="hidden" name="op-cud" value="save" />
+                        <input type="hidden" name="op" value="cud-save" />
                         <input type="hidden" name="layout_id" value="[% layout_id | html %]" />
                     </fieldset>
                 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
index 185a622e84..8d1b14aeed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
@@ -125,7 +125,7 @@
                                     <fieldset class="action">
                                         <input type="submit" class="btn btn-primary" value="Save" />
                                         <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=profile" class="cancel">Cancel</a>
-                                        <input type="hidden" name="op-cud" value="save" />
+                                        <input type="hidden" name="op" value="cud-save" />
                                         <input type="hidden" name="profile_id" value="[% profile_id | html %]" />
                                     </fieldset>
                     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
index dfabd40a1f..eab343b47c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
@@ -177,7 +177,7 @@
                     <fieldset class="action">
                         <input type="submit" class="btn btn-primary" value="Save" />
                         <a class="cancel" href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Cancel</a>
-                        <input type="hidden" name="op-cud" value="save" />
+                        <input type="hidden" name="op" value="cud-save" />
                         [% IF ( template_id ) %]
                         <input type="hidden" name="template_id" value="[% template_id | html %]" />
                         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
index c4ab60c0e0..3ab37875dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
@@ -75,7 +75,7 @@
                                 [% END %]
                             </fieldset>
                             <fieldset class="action">
-                                <input type="hidden" name="op-cud" value="upload" />
+                                <input type="hidden" name="op" value="cud-upload" />
                                 <input class="btn btn-primary" id="uploadsu" type="submit" value="Upload" />
                             </fieldset>
                         </form>
@@ -133,7 +133,7 @@
                                 [% END %]
                             </fieldset>
                             <fieldset class="action">
-                                <input type="hidden" name="op-cud" value="delete" />
+                                <input type="hidden" name="op" value="cud-delete" />
                                 <input class="btn btn-primary" type="button" id="delete" value="Delete selected" />
                             </fieldset>
                         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
index 5312b3c84e..cae215e4f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
@@ -63,7 +63,7 @@
             </h3>
             <form id="exportingf" name="exporting" method="post" action="/cgi-bin/koha/patroncards/print.pl">
                 [% INCLUDE 'csrf-token.inc' %]
-                <input type="hidden" name="op-cud" value="export" />
+                <input type="hidden" name="op" value="cud-export" />
                 <input type="hidden" name="referer" value="[% referer | html %]" />
                 [% FOREACH batch_id IN batch_ids %]
                     <input type="hidden" name="batch_id" value="[% batch_id.batch_id | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
index 4be23c04a3..5866f75ded 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
@@ -55,7 +55,7 @@
                         </ol>
                     </fieldset>
                     <fieldset class="action">
-                        <input type="hidden" name="op-cud" value="Upload" />
+                        <input type="hidden" name="op" value="cud-Upload" />
                         <input type="submit" class="btn btn-primary" value="Upload" />
                     </fieldset>
                 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
index a1e8baa29a..4c23d8d0b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
@@ -45,7 +45,7 @@
                 [% IF ( CAN_user_parameters_manage_cash_registers ) %]
                     <form action="/cgi-bin/koha/admin/cash_registers.pl" method="post">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="add_form" />
+                        <input type="hidden" name="op" value="cud-add_form" />
                         <button class="new" type="submit"><i class="fa fa-plus"></i> Create a new cash register</button>
                     </form>
                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
index 92c60e3e69..5fb0a0dec1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
@@ -42,7 +42,7 @@
                     [% IF ( CAN_user_parameters_manage_cash_registers ) %]
                         <form action="/cgi-bin/koha/admin/cash_registers.pl" method="post">
                             [% INCLUDE 'csrf-token.inc' %]
-                            <input type="hidden" name="op-cud" value="add_form" />
+                            <input type="hidden" name="op" value="cud-add_form" />
                             <button class="new" type="submit"><i class="fa fa-plus"></i> Create a new cash register</button>
                         </form>
                     [% END %]
@@ -338,7 +338,7 @@
                     </div> <!-- /.modal-body -->
                     <div class="modal-footer">
                         <input type="hidden" name="registerid" value="[% register.id | html %]">
-                        <input type="hidden" name="op-cud" value="refund">
+                        <input type="hidden" name="op" value="cud-refund">
                         <button type="submit" class="btn btn-default" id="pos_refund_confirm">Confirm</button>
                         <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
                     </div> <!-- /.modal-footer -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
index 02bcd262d7..e8015f2d3a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
@@ -39,7 +39,7 @@
                             [% IF ( CAN_user_parameters_manage_cash_registers ) %]
                                 <form action="/cgi-bin/koha/admin/cash_registers.pl" method="post">
                                     [% INCLUDE 'csrf-token.inc' %]
-                                    <input type="hidden" name="op-cud" value="add_form" />
+                                    <input type="hidden" name="op" value="cud-add_form" />
                                     <button class="new" type="submit"><i class="fa fa-plus"></i> Create a new cash register</button>
                                 </form>
                             [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt
index c7529b50b5..93bcd851e3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt
@@ -44,7 +44,7 @@
                 <div class="page-section">
                     <form method="post" action="/cgi-bin/koha/recalls/recalls_overdue.pl">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="cancel_multiple_recalls">
+                        <input type="hidden" name="op" value="cud-cancel_multiple_recalls">
                         <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
                         [% INCLUDE 'recalls.inc' %]
                         <fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt
index 2f4a707887..97e7af16ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt
@@ -44,7 +44,7 @@
                 <div class="page-section">
                     <form method="post" action="/cgi-bin/koha/recalls/recalls_queue.pl">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="cancel_multiple_recalls">
+                        <input type="hidden" name="op" value="cud-cancel_multiple_recalls">
                         <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
                         [% INCLUDE 'recalls.inc' %]
                         <fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt
index 077da1bcdb..a6d4786387 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt
@@ -127,7 +127,7 @@
                                     <form action="/cgi-bin/koha/recalls/recalls_to_pull.pl" method="post">
                                         [% INCLUDE 'csrf-token.inc' %]
                                         <input type="hidden" name="recall_id" value="[% recall.first_recall.id | html %]">
-                                        <input type="hidden" name="op-cud" value="cancel">
+                                        <input type="hidden" name="op" value="cud-cancel">
                                         [% IF recall.first_recall.in_transit %]
                                             <button type="submit" class="btn btn-default btn-sm cancelreturn"><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.first_recall.item.homebranch) | html %]</button>
                                         [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt
index 5605d04f83..92690b4d0d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt
@@ -81,7 +81,7 @@
                                                     <form action="/cgi-bin/koha/recalls/recalls_waiting.pl" method="post">
                                                         [% INCLUDE 'csrf-token.inc' %]
                                                         <input type="hidden" name="recall_id" value="[% recall.id | html %]">
-                                                        <input type="hidden" name="op-cud" value="modify">
+                                                        <input type="hidden" name="op" value="cud-modify">
                                                         <fieldset class="action">
                                                             <button type="submit" name="revert" value="revert" class="btn btn-default btn-sm revert_recall"><i class="fa fa-undo"></i> Revert waiting status</button>
                                                             <button type="submit" name="expire" value="expire" class="btn btn-default btn-sm expire_recall"><i class="fa fa-undo"></i> Expire recall</button>
@@ -126,7 +126,7 @@
                                                         <form action="/cgi-bin/koha/recalls/recalls_waiting.pl" method="post">
                                                             [% INCLUDE 'csrf-token.inc' %]
                                                             <input type="hidden" name="recall_id" value="[% recall.id | html %]">
-                                                            <input type="hidden" name="op-cud" value="modify">
+                                                            <input type="hidden" name="op" value="cud-modify">
                                                             <fieldset class="action">
                                                                 <button type="submit" name="revert" value="revert" class="btn btn-default btn-sm revert_recall"><i class="fa fa-undo"></i> Revert waiting status</button>
                                                                 <button type="submit" name="expire" value="expire" class="btn btn-default btn-sm expire_recall"><i class="fa fa-undo"></i> Expire recall</button>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt
index 418aeafb00..c77f4a16db 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt
@@ -44,7 +44,7 @@
             <div class="page-section">
                 <form method="post" action="/cgi-bin/koha/recalls/request.pl">
                     [% INCLUDE 'csrf-token.inc' %]
-                    <input type="hidden" name="op-cud" value="cancel_multiple_recalls">
+                    <input type="hidden" name="op" value="cud-cancel_multiple_recalls">
                     <input type="hidden" name="biblionumber" value="[% biblio.biblionumber | html %]">
                     <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
                     [% INCLUDE 'recalls.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 8ca761bd34..a3c0f075fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -946,7 +946,7 @@
                                 <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batch_record_modification.pl" id="batch_record_modification" target="_blank">
                                     [% INCLUDE 'csrf-token.inc' %]
                                     <input type="hidden" name="recordtype" value="biblio" />
-                                    <input type="hidden" name="op-cud" value="list" />
+                                    <input type="hidden" name="op" value="cud-list" />
                                     [% # Preserve the whitespace of the following textarea in order to format the values correctly %]
                                     <textarea style="display:none" name="recordnumber_list" id="recordnumber_list">
                                         [%- recordnumbers = PROCESS batch_list results=results batch_type='biblionumber' | trim | html %][% IF recordnumbers %][% SET batch_biblionumbers = 1 %][% recordnumbers | html %][% END -%]
@@ -956,7 +956,7 @@
                                 <form method="POST" action="/cgi-bin/koha/tools/batch_delete_records.pl" id="batch_record_deletion" target="_blank">
                                     [% INCLUDE 'csrf-token.inc' %]
                                     <input type="hidden" name="recordtype" value="biblio" />
-                                    <input type="hidden" name="op-cud" value="list" />
+                                    <input type="hidden" name="op" value="cud-list" />
                                     [% # Preserve the whitespace of the following textarea in order to format the values correctly %]
                                     <textarea style="display:none" name="recordnumber_list" id="recordnumber_list">
                                         [%- recordnumbers = PROCESS batch_list results=results batch_type='biblionumber' | trim | html %][% IF recordnumbers %][% SET batch_biblionumbers = 1 %][% recordnumbers | html %][% END -%]
@@ -965,7 +965,7 @@
 
                                 <form method="POST" action="/cgi-bin/koha/tools/batchMod.pl" id="batch_item_modification" target="_blank">
                                     [% INCLUDE 'csrf-token.inc' %]
-                                    <input type="hidden" name="op-cud" value="show" />
+                                    <input type="hidden" name="op" value="cud-show" />
                                     [% FOREACH result IN results %]
                                         [% FOREACH cells IN result.cells %]
                                             [% place = loop.index %]
@@ -981,7 +981,7 @@
 
                                 <form method="POST" action="/cgi-bin/koha/tools/batchMod.pl" id="batch_item_deletion" target="_blank">
                                     [% INCLUDE 'csrf-token.inc' %]
-                                    <input type="hidden" name="op-cud" value="show" />
+                                    <input type="hidden" name="op" value="cud-show" />
                                     <input type="hidden" name="del" value="1" />
                                     [% FOREACH result IN results %]
                                         [% FOREACH cells IN result.cells %]
@@ -1012,7 +1012,7 @@
 
                                 <form method="POST" action="/cgi-bin/koha/tools/modborrowers.pl" id="batch_patron_modification" target="_blank">
                                     [% INCLUDE 'csrf-token.inc' %]
-                                    <input type="hidden" name="op-cud" value="show" />
+                                    <input type="hidden" name="op" value="cud-show" />
                                     [% # Preserve the whitespace of the following textarea in order to format the values correctly %]
                                     <textarea style="display:none" name="cardnumberlist" id="cardnumberlist">
                                         [%- cardnumbers = PROCESS batch_list results=results batch_type='cardnumber' | trim | html %][% IF cardnumbers %][% SET batch_cardnumbers = 1 %][% cardnumbers | html %][% END -%]
@@ -1021,7 +1021,7 @@
 
                                 <form action="/cgi-bin/koha/patroncards/edit-batch.pl" id="patron_card_creator" method="post" target="_blank">
                                     [% INCLUDE 'csrf-token.inc' %]
-                                    <input type="hidden" name="op-cud" value="add" />
+                                    <input type="hidden" name="op" value="cud-add" />
                                     <input type="hidden" name="batch_id" value="0" />
                                     [% # Preserve the whitespace of the following textarea in order to format the values correctly %]
                                     <textarea style="display:none;" name="bor_num_list" id="bor_num_list">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
index 4c6991daec..68e089fd37 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
@@ -218,7 +218,7 @@
                                             <option value="[% letter.code | html %]">[% letter.name | html %]</option>
                                         [% END %]
                                     </select>
-                                    <input type="hidden" name="op-cud" value="send_alert" />
+                                    <input type="hidden" name="op" value="cud-send_alert" />
                                     <input type="hidden" name="supplierid" value="[% supplierid | html %]" />
                                     <input type="submit" name="submit" class="btn btn-primary" value="Send notification" />
                                 </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
index 5ee7bfd62d..9c9dbd7edb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
@@ -44,7 +44,7 @@
 
 <form method="post" action="routing.pl">
     [% INCLUDE 'csrf-token.inc' %]
-<input type="hidden" name="op-cud" value="save" />
+<input type="hidden" name="op" value="cud-save" />
 <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" />
 <fieldset class="rows">
 	<ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
index ec7938d882..6aa953b859 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
@@ -120,7 +120,7 @@ $(document).ready(function() {
 </div>
 [% END %]
 
-    <input type="hidden" name="op-cud" value="serialchangestatus" />
+    <input type="hidden" name="op" value="cud-serialchangestatus" />
     [% FOREACH subscription IN subscriptions %]
     <input type="hidden" name="subscriptionid" value="[% subscription.subscriptionid | html %]" />
     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
index 92d00cc9b6..2c6705656e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -58,10 +58,10 @@ fieldset.rows table { clear: none; margin: 0; }
                 <div class="row" id="page_1">
                     <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
                         [% IF ( modify ) %]
-                            <input type="hidden" name="op-cud" value="modsubscription" />
+                            <input type="hidden" name="op" value="cud-modsubscription" />
                             <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" />
                         [% ELSE %]
-                                <input type="hidden" name="op-cud" value="addsubscription" />
+                                <input type="hidden" name="op" value="cud-addsubscription" />
                         [% END %]
                         <input type="hidden" name="user" value="[% logged_in_user.userid | html %]" />
                         <input type="hidden" name="irreg_check" value="0" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index 5e9c555588..8224605441 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -66,7 +66,7 @@
                             [% INCLUDE 'csrf-token.inc' %]
                             <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" />
                             <input type="hidden" name="issueconfirmed" value="1" />
-                            <input type="hidden" name="op-cud" value="del" />
+                            <input type="hidden" name="op" value="cud-del" />
                             <button type="submit" class="approve" accesskey="y"><i class="fa fa-fw fa-check"></i> Yes, delete (Y)</button>
                         </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
index 6eb129a3ec..769c8824b8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
@@ -46,9 +46,9 @@
             [% INCLUDE 'csrf-token.inc' %]
           [% IF (modify) %]
             <input type="hidden" name="id" value="[% id | html %]" />
-            <input type="hidden" name="op-cud" value="savemod" />
+            <input type="hidden" name="op" value="cud-savemod" />
           [% ELSE %]
-            <input type="hidden" name="op-cud" value="savenew" />
+            <input type="hidden" name="op" value="cud-savenew" />
           [% END %]
           <fieldset class="rows">
             <ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
index eeda06c391..b8c89cf67a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
@@ -36,7 +36,7 @@
         <div id="subscription_form_history">
           <form method="post" action="/cgi-bin/koha/serials/subscription-history.pl">
               [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="mod" />
+            <input type="hidden" name="op" value="cud-mod" />
             <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" />
             <p>Hint : you can update the serial history manually. This can be useful for an old subscription or to clean the existing history. Modify those fields with care, as future serial receive will continue to update them automatically.</p>
             <table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
index ca4552f438..236fd79502 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
@@ -63,9 +63,9 @@
           <form action="/cgi-bin/koha/serials/subscription-numberpatterns.pl" method="post" class="validated">
               [% INCLUDE 'csrf-token.inc' %]
             [% IF (new) %]
-              <input type="hidden" name="op-cud" value="savenew" />
+              <input type="hidden" name="op" value="cud-savenew" />
             [% ELSE %]
-              <input type="hidden" name="op-cud" value="savemod" />
+              <input type="hidden" name="op" value="cud-savemod" />
               <input type="hidden" name="id" value="[% id | html %]" />
             [% END %]
             <fieldset class="rows">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
index 84d8ef948b..cb2940cfcb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
@@ -31,7 +31,7 @@
 
 <form name="f" action="/cgi-bin/koha/serials/subscription-renew.pl" method="post">
     [% INCLUDE 'csrf-token.inc' %]
-		<input type="hidden" name="op-cud" value="renew" />
+		<input type="hidden" name="op" value="cud-renew" />
 		<input type="hidden" name="subscriptionid" value="[% subscription.subscriptionid | html %]" />
 		<fieldset class="rows"><legend>Subscription renewal for [% subscription.bibliotitle | html %]</legend>
         <ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index c2a749ef34..e8149b6e64 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -632,7 +632,7 @@
 
                 <fieldset class="action">
                     <input type="hidden" id="returnsuggested" name="returnsuggested" value="[% IF ( returnsuggestedby ) %][% returnsuggestedby | html %][% ELSE %]noone[% END %]"/>
-                    <input type="hidden" name="op-cud" value="[% op | html %]" />
+                    <input type="hidden" name="op" value="cud-[% op | html %]" />
                     [% IF ( suggestionid ) %]
                         [% IF ( need_confirm ) %]
                             <input type="hidden" name="save_confirmed" value="1" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
index 69ee43ab3a..2a7ff46f7b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
@@ -224,7 +224,7 @@
 
     <form id="add_additional_content" method="post" action="/cgi-bin/koha/tools/additional-contents.pl" class="validate">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="add_validate" />
+        <input type="hidden" name="op" value="cud-add_validate" />
         <input type="hidden" name="category" value="[% category | html %]" />
         <input type="hidden" name="code" value="[% additional_content.code | html %]" />
         <input type="hidden" name="id" value="[% additional_content.id | html %]" />
@@ -482,13 +482,13 @@
                         [% END %]
                     </tbody>
                 </table>
-                <input type="hidden" name="op-cud" value="delete_confirmed" />
+                <input type="hidden" name="op" value="cud-delete_confirmed" />
                 <input type="hidden" name="category" value="[% category | html %]" />
                 <fieldset class="action"><input type="submit" class="btn btn-primary" value="Delete selected" /></fieldset>
             </form>
             <form action="/cgi-bin/koha/tools/additional-contents.pl" method="post" id="delete_single">
                 [% INCLUDE 'csrf-token.inc' %]
-                <input type="hidden" id="del_op" name="op-cud" value="delete_confirmed" />
+                <input type="hidden" id="del_op" name="op" value="cud-delete_confirmed" />
                 <input type="hidden" id="del_category" name="category" value="[% category | html %]" />
                 <input type="hidden" id="del_ids" name="ids" />
             </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
index 3ac687a221..a672eae682 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
@@ -156,7 +156,7 @@
                   </fieldset>
                 [% END %]
                 </div>
-                <input type="hidden" name="op-cud" value="update" />
+                <input type="hidden" name="op" value="cud-update" />
             </div>
           </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
index 3ec4c4b8bc..f330111a56 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
@@ -134,7 +134,7 @@
 <form name="f" action="batchMod.pl" method="post">
     [% INCLUDE 'csrf-token.inc' %]
      <input type="hidden" name="biblionumber" id="biblionumber" value="[% biblionumber | html %]" />
-     <input type="hidden" name="op-cud" value="[% op | html %]" />
+     <input type="hidden" name="op" value="cud-[% op | html %]" />
      <input type="hidden" name="searchid" value="[% searchid | html %]" />
      <input type="hidden" name="src" id="src" value="[% src | html %]" />
      [% IF biblionumber %]
@@ -167,7 +167,7 @@
 
     [% IF ( itemresults ) %]
         <div id="cataloguing_additem_newitem" class="item_edit_form">
-         <input type="hidden" name="op-cud" value="[% op | html %]" />
+         <input type="hidden" name="op" value="cud-[% op | html %]" />
          <p>This will delete [% IF ( too_many_items_display ) %]all the[% ELSE %]the selected[% END %] items.</p>
          <input type="hidden" name="del" value="1" />
          <input type="checkbox" name="del_records" id="del_records" /> <label for="del_records">Delete records if no items remain.</label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
index 058920ca7c..ad6a892384 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
@@ -158,7 +158,7 @@
 
         <form name="f" action="batchMod.pl" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op-cud" value="[% op | html %]" />
+            <input type="hidden" name="op" value="cud-[% op | html %]" />
             <input type="hidden" name="searchid" value="[% searchid | html %]" />
             <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
             <input type="hidden" name="src" id="src" value="[% src | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
index 46c43d9a46..3beaabecc4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
@@ -65,7 +65,7 @@
                                       <textarea rows="10" cols="30" id="barcodelist" name="barcodelist"></textarea>
                                     </li>
                                 </ol>
-                                <input type="hidden" name="op-cud" value="show" />
+                                <input type="hidden" name="op" value="cud-show" />
                             </fieldset>
 
                             [% UNLESS del %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
index c7f8e7547b..601b983f2a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
@@ -143,7 +143,7 @@
         [% END # /WRAPPER tabs %]
 
       <fieldset class="action">
-        <input type="hidden" name="op-cud" value="list" />
+        <input type="hidden" name="op" value="cud-list" />
         <input type="submit" class="btn btn-primary" value="Continue" />
         <a class="cancel" href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cancel</a>
       </fieldset>
@@ -219,7 +219,7 @@
           <div class="note"><i class="fa fa-exclamation"></i> Reminder: this action will delete all selected authorities!</div>
       [% END %]
         <fieldset class="action">
-          <input type="hidden" name="op-cud" value="delete" />
+          <input type="hidden" name="op" value="cud-delete" />
           <input type="hidden" name="recordtype" value="[% recordtype | html %]" />
           <input type="submit" class="btn btn-primary" value="Delete selected records" />
           <a class="cancel" href="/cgi-bin/koha/tools/batch_delete_records.pl">Cancel</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
index 0940d13296..994deb91cb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
@@ -150,7 +150,7 @@
                                 </ol>
                             </fieldset>
                             <fieldset class="action">
-                                <input type="hidden" name="op-cud" value="list" />
+                                <input type="hidden" name="op" value="cud-list" />
                                 <input type="submit" class="btn btn-primary" value="Continue" />
                                 <a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a>
                             </fieldset>
@@ -197,7 +197,7 @@
                                 </div> <!-- /.page-section -->
                                 <div class="note"><i class="fa fa-exclamation"></i> Reminder: this action will modify all selected checkouts!</div>
                                 <fieldset class="action">
-                                    <input type="hidden" name="op-cud" value="modify" />
+                                    <input type="hidden" name="op" value="cud-modify" />
                                     <input type="hidden" name="new_hard_due_date" value="[% new_hard_due_date | $KohaDates dateformat => 'iso' %]" />
                                     <input type="hidden" name="due_date_days" value="[% due_date_days | html %]" />
                                     <input type="submit" class="btn btn-primary" value="Modify selected checkouts" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
index e40a945d20..2f62c2d81f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
@@ -161,7 +161,7 @@
                                 </ol>
                             </fieldset>
                             <fieldset class="action">
-                                <input type="hidden" name="op-cud" value="list" />
+                                <input type="hidden" name="op" value="cud-list" />
                                 <input type="submit" class="btn btn-primary" value="Continue" />
                                 <a class="cancel" href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cancel</a>
                             </fieldset>
@@ -257,7 +257,7 @@
                                     <div class="note"><i class="fa fa-exclamation"></i> Reminder: this action will modify all selected authorities!</div>
                                 [% END %]
                                 <fieldset class="action">
-                                    <input type="hidden" name="op-cud" value="modify" />
+                                    <input type="hidden" name="op" value="cud-modify" />
                                     <input type="hidden" name="recordtype" value="[% recordtype | html %]" />
                                     <input type="submit" id="mainformsubmit" value="Modify selected records" class="button" />
                                 </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
index 5279a1636b..fd811e6f9e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
@@ -152,7 +152,7 @@
 
     <form action="/cgi-bin/koha/tools/csv-profiles.pl" class="validated" method="post">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="add_validate" />
+        <input type="hidden" name="op" value="cud-add_validate" />
         <input type="hidden" name="export_format_id" value="[% csv_profile.export_format_id | html %]" />
         <fieldset class="rows">
             <ol>
@@ -281,7 +281,7 @@
             <h1>[% tx("Delete CSV profile '{csv_profile_name}'?", {csv_profile_name = csv_profile.profile }) | html %]</h1>
             <form action="/cgi-bin/koha/tools/csv-profiles.pl" method="post">
                 [% INCLUDE 'csrf-token.inc' %]
-                <input type="hidden" name="op-cud" value="delete_confirmed" />
+                <input type="hidden" name="op" value="cud-delete_confirmed" />
                 <input type="hidden" name="export_format_id" value="[% csv_profile.export_format_id | html %]" />
                 <button type="submit" class="approve"><i class="fa fa-check" aria-hidden="true"></i> Yes, delete</button>
             </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
index 25c87314e3..18518f0d12 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
@@ -190,7 +190,7 @@
                         </li>
                     </ol>
                 </fieldset>
-                <input type="hidden" name="op-cud" value="export" />
+                <input type="hidden" name="op" value="cud-export" />
                 <input type="hidden" name="record_type" value="bibs" />
                 <fieldset class="action">
                     <input type="submit" class="btn btn-primary" value="Export bibliographic records" />
@@ -266,7 +266,7 @@
                     </ol>
                 </fieldset>
 
-                <input type="hidden" name="op-cud" value="export" />
+                <input type="hidden" name="op" value="cud-export" />
                 <input type="hidden" name="record_type" value="auths" />
 
                 <fieldset class="action"><input type="submit" class="btn btn-primary" value="Export authority records" /></fieldset>
@@ -292,7 +292,7 @@
                     </fieldset>
 
                     [% IF ( dbfiles && (dbfiles.size > 0) ) %]
-                        <input type="hidden" name="op-cud" value="export" />
+                        <input type="hidden" name="op" value="cud-export" />
                         <input type="hidden" name="record_type" value="db" />
                         <fieldset class="action"><input type="submit" class="btn btn-primary" value="Download database" /></fieldset>
                     [% END %]
@@ -319,7 +319,7 @@
                     </fieldset>
 
                     [% IF ( conffiles && (conffiles.size > 0) ) %]
-                        <input type="hidden" name="op-cud" value="export" />
+                        <input type="hidden" name="op" value="cud-export" />
                         <input type="hidden" name="record_type" value="conf" />
                         <fieldset class="action"><input type="submit" class="btn btn-primary" value="Download configuration" /></fieldset>
                     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
index 7d9b924f56..d621e06957 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
@@ -237,7 +237,7 @@
            <input type="checkbox" name="CSVexport" id="CSVexport" />
         </li>
         </ol>
-            <input type="hidden" name="op-cud" value="do_it" />
+            <input type="hidden" name="op" value="cud-do_it" />
   </fieldset>
 
             <fieldset class="action"><input type="submit" class="btn btn-primary" value="Submit" /></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
index 4de91af094..671127b260 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -245,7 +245,7 @@
                                                 [% IF !independant_branch || !lette.branchcode %]
                                                     <form method="post" action="/cgi-bin/koha/tools/letter.pl">
                                                         [% INCLUDE 'csrf-token.inc' %]
-                                                        <input type="hidden" name="op-cud" value="copy_form" />
+                                                        <input type="hidden" name="op" value="cud-copy_form" />
                                                         <input type="hidden" name="oldbranchcode" value="[% lette.branchcode | html %]" />
                                                         <input type="hidden" name="module" value="[% lette.module | html %]" />
                                                         <input type="hidden" name="code" value="[% lette.code | html %]" />
@@ -307,9 +307,9 @@
                     <form id="add_notice" name="Aform" method="post" enctype="multipart/form-data" class="validate">
                         [% INCLUDE 'csrf-token.inc' %]
                         [% IF add_form %]
-                            <input type="hidden" name="op-cud" id="op" value="add_validate" />
+                            <input type="hidden" name="op" id="op" value="cud-add_validate" />
                         [% ELSE %]
-                            <input type="hidden" name="op-cud" id="op" value="copy_validate" />
+                            <input type="hidden" name="op" id="op" value="cud-copy_validate" />
                         [% END %]
 
                         <input type="hidden" name="checked" value="0" />
@@ -531,7 +531,7 @@
                         </table>
                         <form action="[% action | html %]" method="post">
                             [% INCLUDE 'csrf-token.inc' %]
-                            <input type="hidden" name="op-cud" value="delete_confirmed">
+                            <input type="hidden" name="op" value="cud-delete_confirmed">
                             <input type="hidden" name="branchcode" value="[% letter.branchcode | html %]" />
                             <input type="hidden" name="code" value="[% letter.code | html %]" />
                             <input type="hidden" name="module" value="[% letter.module | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
index 88d658c4c9..54e2de41b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
@@ -122,7 +122,7 @@
                         [% IF ( can_commit ) %]
                             <form method="post">
                                 [% INCLUDE 'csrf-token.inc' %]
-                                <input type="hidden" name="op-cud" value="redo-matching" />
+                                <input type="hidden" name="op" value="cud-redo-matching" />
                                 <input type="hidden" name="import_batch_id" value="[% import_batch_id | html %]" />
                                 <input type="hidden" name="current_matcher_id" value="[% current_matcher_id | html %]" />
                         [% END %]
@@ -271,7 +271,7 @@
                             [% IF ( can_commit ) %]
                                 <form method="post" id="import_batch_form">
                                     [% INCLUDE 'csrf-token.inc' %]
-                                    <input type="hidden" name="op-cud" value="commit-batch" />
+                                    <input type="hidden" name="op" value="cud-commit-batch" />
                                     <input type="hidden" name="import_batch_id" value="[% import_batch_id | html %]" />
                                     [% IF ( record_type != 'auth' ) %]
                                         <fieldset class="rows">
@@ -308,7 +308,7 @@
                             [% IF ( can_revert ) %]
                                 <form method="post" id="revert_batch_form">
                                     [% INCLUDE 'csrf-token.inc' %]
-                                    <input type="hidden" name="op-cud" value="revert-batch" />
+                                    <input type="hidden" name="op" value="cud-revert-batch" />
                                     <input type="hidden" name="import_batch_id" value="[% import_batch_id | html %]" />
                                     <fieldset class="action"><input type="submit" class="button" name="mainformsubmit" value="Undo import into catalog" /></fieldset>
                                 </form>
@@ -377,14 +377,14 @@
                                                     <form method="post" name="clean_batch_[% batch_lis.import_batch_id | html %]" id="clean_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_clean">
                                                         [% INCLUDE 'csrf-token.inc' %]
                                                         <input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id | html %]" />
-                                                        <input type="hidden" name="op-cud" value="clean-batch" />
+                                                        <input type="hidden" name="op" value="cud-clean-batch" />
                                                         <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-eraser"></i> Clean</button>
                                                     </form>
                                                 [% ELSIF ( batch_lis.import_status == 'cleaned' ) %]
                                                     <form method="post" action="/cgi-bin/koha/tools/manage-marc-import.pl" name="delete_batch_[% batch_lis.import_batch_id | html %]" id="delete_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_delete">
                                                         [% INCLUDE 'csrf-token.inc' %]
                                                         <input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id | html %]" />
-                                                        <input type="hidden" name="op-cud" value="delete-batch" />
+                                                        <input type="hidden" name="op" value="cud-delete-batch" />
                                                         <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-trash-can"></i> Delete</button>
                                                     </form>
                                                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
index 414db711f8..69a96a113e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
@@ -297,7 +297,7 @@
                             <fieldset class="action">
                                 <input type="hidden" name="template_id" value="[% template_id | html %]" />
                                 <input type="hidden" name="mmta_id" id="mmta_id" />
-                                <input type="hidden" name="op-cud" value="add_action" />
+                                <input type="hidden" name="op" value="cud-add_action" />
                                 <input type="submit" id="action_submit" class="btn btn-primary" value="Add action" />
                                 <a href="#modaction" class="cancel" id="cancel_edit" onclick="cancelEditAction();">Cancel</a>
                             </fieldset>
@@ -333,7 +333,7 @@
                                 <span class="required">Required</span>
                             </p>
 
-                            <input type="hidden" name="op-cud" value="create_template" />
+                            <input type="hidden" name="op" value="cud-create_template" />
 
                             <p>
                                 <label for="duplicate_a_template">Duplicate a template:</label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
index 9433726e00..9dac594e99 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
@@ -64,7 +64,7 @@
                     <h1>Batch patron modification</h1>
                     <form id="patron_batchmod_form" method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/modborrowers.pl">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="show" />
+                        <input type="hidden" name="op" value="cud-show" />
 
                         [% WRAPPER tabs id= "batch_patron_options" %]
                             [% WRAPPER tabs_nav %]
@@ -223,7 +223,7 @@
                     [% IF ( op == 'show' ) %]
                     <form name="f" action="modborrowers.pl" method="post" id="batchmod-borrowers-form">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="do" />
+                        <input type="hidden" name="op" value="cud-do" />
                         [% IF ( borrowers ) %]
                             <div class="btn-toolbar selections-toolbar"><a id="selectallbutton" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="clearallbutton" href="#"><i class="fa fa-times"></i> Clear all</a></div>
                         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
index 74337589f9..9abe504eb5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
@@ -70,7 +70,7 @@
             [% IF ( table ) %]
                 <form method="post" action="/cgi-bin/koha/tools/overduerules.pl">
                     [% INCLUDE 'csrf-token.inc' %]
-                    <input type="hidden" name="op-cud" value="save" />
+                    <input type="hidden" name="op" value="cud-save" />
                     <input type="hidden" name="branch" value="[% branch | html %]" />
                     <h3>Rules for overdue actions: [% IF ( branch ) %][% Branches.GetName( branch ) | html %][% ELSE %] default library [% END %]</h3>
                         [% IF ( datasaved ) %]<div class="dialog message">Changes saved.</div> [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
index f4f0d3fd75..e2b70786f4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
@@ -157,7 +157,7 @@
 	            </fieldset>
                     <fieldset class="action">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="Upload" />
+                        <input type="hidden" name="op" value="cud-Upload" />
                         <input type="submit" class="btn btn-primary" value="Upload" />
 						<a href="/cgi-bin/koha/tools/tools-home.pl" class="cancel">Cancel</a>
                     </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
index 384a2e1208..988dc222a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
@@ -85,7 +85,7 @@
     <form action="/cgi-bin/koha/tools/quotes.pl" id="Aform" name="Aform" class="validated" method="post">
         [% INCLUDE 'csrf-token.inc' %]
         <fieldset class="rows">
-            <input type="hidden" name="op-cud" value="add_validate" />
+            <input type="hidden" name="op" value="cud-add_validate" />
             <ol>
                 <li>
                     <label for="text" class="required">Source: </label>
@@ -113,7 +113,7 @@
             [% INCLUDE 'csrf-token.inc' %]
             <h1>Are you sure you want to delete the following quote?</h1>
             [% quote.source | html %] - [% quote.text | html %]
-            <input type="hidden" name="op-cud" value="delete_confirmed" />
+            <input type="hidden" name="op" value="cud-delete_confirmed" />
             <input type="hidden" name="id" value="[% quote.id | html %]" />
             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
index e1709d05a2..a231a2cbc7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
@@ -215,7 +215,7 @@
                         [% IF rota.rota_id %]
                             <input type="hidden" name="id" value="[% rota.rota_id | html %]">
                         [% END %]
-                        <input type="hidden" name="op-cud" value="process_rota">
+                        <input type="hidden" name="op" value="cud-process_rota">
                     </form>
 
                 [% ELSIF (op == 'manage_stages') %]
@@ -278,7 +278,7 @@
                                     <div class="modal-footer">
                                         <input type="hidden" name="stage_id" value="[% stage.id | html %]">
                                         <input type="hidden" name="rota_id" value="[% rota_id | html %]">
-                                        <input type="hidden" name="op-cud" value="process_stage">
+                                        <input type="hidden" name="op" value="cud-process_stage">
                                         <button type="submit" class="btn btn-primary">Save</button>
                                         <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
                                     </div> <!-- /.modal-footer -->
@@ -373,7 +373,7 @@
                         </fieldset>
                         <input type="hidden" name="stage_id" value="[% stage.id | html %]">
                         <input type="hidden" name="rota_id" value="[% rota_id | html %]">
-                        <input type="hidden" name="op-cud" value="process_stage">
+                        <input type="hidden" name="op" value="cud-process_stage">
                     </form>
                 [% ELSIF (op == 'confirm_remove_from_rota') %]
 
@@ -467,7 +467,7 @@
                                     </div> <!-- /.modal-body -->
                                     <div class="modal-footer">
                                         <input type="hidden" name="rota_id" value="[% rota.id | html %]">
-                                        <input type="hidden" name="op-cud" value="add_items_to_rota">
+                                        <input type="hidden" name="op" value="cud-add_items_to_rota">
                                         <button type="submit" class="btn btn-primary">Save</button>
                                         <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
                                     </div> <!-- /.modal-footer -->
@@ -615,7 +615,7 @@
                                 <input type="submit" class="btn btn-primary" value="Save" />
                             </fieldset>
                             <input type="hidden" name="rota_id" value="[% rota_id | html %]">
-                            <input type="hidden" name="op-cud" value="move_items_to_rota">
+                            <input type="hidden" name="op" value="cud-move_items_to_rota">
                         </form>
                     [% END %]
                     <p><a href="?op=manage_items&amp;rota_id=[% rota_id | uri %]">Return to rota</a></p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
index e1cbed476f..81841c821f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
@@ -102,7 +102,7 @@
     <form method="post" id="browsefile" action="/cgi-bin/koha/tools/upload.pl">
         [% INCLUDE 'csrf-token.inc' %]
         [% PROCESS plugin_pars %]
-        <input type="hidden" name="op-cud" value="browse"/>
+        <input type="hidden" name="op" value="cud-browse"/>
         <fieldset class="brief">
         <h4>Search uploads by category</h4>
         <ol>
@@ -132,7 +132,7 @@
     <form method="post" id="searchfile" action="/cgi-bin/koha/tools/upload.pl">
         [% INCLUDE 'csrf-token.inc' %]
         [% PROCESS plugin_pars %]
-        <input type="hidden" name="op-cud" value="search"/>
+        <input type="hidden" name="op" value="cud-search"/>
         <fieldset class="brief">
         <h4>Search uploads by name or hashvalue</h4>
         <ol>
@@ -152,7 +152,7 @@
     <form id="submitter" style="display:none;" method="post">
         [% INCLUDE 'csrf-token.inc' %]
         [% PROCESS plugin_pars %]
-        <input type="hidden" name="op-cud" id="op" value=""/>
+        <input type="hidden" name="op" id="op" value=""/>
         <input type="hidden" name="id" id="id" value="" />
         <input type="hidden" name="msg" id="msg" value="" />
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
index 8c905bafe8..67413a7cd5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -211,7 +211,7 @@
                 <form action="/cgi-bin/koha/virtualshelves/shelves.pl" id="transferform" method="post">
                     [% INCLUDE 'csrf-token.inc' %]
                     <fieldset>
-                        <input type="hidden" name="op-cud" value="transfer" />
+                        <input type="hidden" name="op" value="cud-transfer" />
                         <input type="hidden" name="public" value="1" />
                         <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
 
@@ -245,7 +245,7 @@
                     <div class="pages">[% pagination_bar | $raw %]</div>
                     <form action="/cgi-bin/koha/virtualshelves/shelves.pl" id="listform" method="post">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="remove_biblios" />
+                        <input type="hidden" name="op" value="cud-remove_biblios" />
                         <input type="hidden" name="referer" value="view" />
                         <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
 
@@ -400,10 +400,10 @@
                     <fieldset class="rows">
                         [% IF op == 'add_form' %]
                             <legend><h1>Create a new list</h1></legend>
-                            <input type="hidden" name="op-cud" value="add" />
+                            <input type="hidden" name="op" value="cud-add" />
                         [% ELSE %]
                             <legend><h1>Edit list <em>[% shelf.shelfname | html %]</em></h1></legend>
-                            <input type="hidden" name="op-cud" value="edit" />
+                            <input type="hidden" name="op" value="cud-edit" />
                         [% END %]
                         <input type="hidden" name="referer" value="[% referer | html %]" />
                         <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
@@ -572,14 +572,14 @@
                                 <li>
                                     <label for="barcodes">Barcodes:</label>
                                     <textarea name="barcodes" id="barcodes" rows="5"></textarea>
-                                    <input type="hidden" name="op-cud" value="add_biblio" />
+                                    <input type="hidden" name="op" value="cud-add_biblio" />
                                     <input type="hidden" name="referer" value="view" />
                                     <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
                                 </li>
                                 <li>
                                     <label for="biblionumbers">Biblio numbers:</label>
                                     <textarea name="biblionumbers" id="biblionumbers" rows="5"></textarea>
-                                    <input type="hidden" name="op-cud" value="add_biblio" />
+                                    <input type="hidden" name="op" value="cud-add_biblio" />
                                     <input type="hidden" name="referer" value="view" />
                                     <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
                                 </li>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
index e7b61dc956..202326779e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
@@ -131,7 +131,7 @@
                         <input id="input-srw" type="radio" name="format" value="srwdc">
                         <label class="label_dc" for="input-srw">SRW-DC</label>
                         <br>
-                        <input type="hidden" name="op-cud" value="export">
+                        <input type="hidden" name="op" value="cud-export">
                         <input type="hidden" name="bib" value="[% biblio.biblionumber | html %]">
                     </fieldset>
                 </div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
index 1de75af839..b61fe92ba8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
@@ -37,7 +37,7 @@
                                 <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]">
                                 <input type="hidden" name="referer" value="[% referer | html %]">
                                 <input type="hidden" name="biblionumber" value="[% biblionumber | html %]">
-                                <input type="hidden" name="op-cud" value="alert_confirmed">
+                                <input type="hidden" name="op" value="cud-alert_confirmed">
                                 <input type="submit" class="btn btn-primary" value="Yes">
                                 <a class="cancel" href="opac-serial-issues.pl?biblionumber=[% biblionumber | html %]" >No</a>
                             </form>
@@ -52,7 +52,7 @@
                                 <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]">
                                 <input type="hidden" name="referer" value="[% referer | html %]">
                                 <input type="hidden" name="biblionumber" value="[% biblionumber | html %]">
-                                <input type="hidden" name="op-cud" value="cancel_confirmed">
+                                <input type="hidden" name="op" value="cud-cancel_confirmed">
                                 <input type="submit" value="Yes" class="btn btn-primary">
                                 <a href="opac-serial-issues.pl?biblionumber=[% biblionumber | uri %]" class="cancel">No</a>
                             </form>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscriptions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscriptions.tt
index f6006392ee..4fdee96af2 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscriptions.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscriptions.tt
@@ -75,7 +75,7 @@
                                                 <input type="hidden" name="subscriptionid" value="[% sub.subscriptionid | html %]">
                                                 <input type="hidden" name="referer" value="[% referer | html %]">
                                                 <input type="hidden" name="biblionumber" value="[% sub.biblionumber | html %]">
-                                                <input type="hidden" name="op-cud" value="cancel_confirmed">
+                                                <input type="hidden" name="op" value="cud-cancel_confirmed">
                                                 <button type="submit" class="btn btn-link btn-sm" name="submit"><i class="fa fa-times" aria-hidden="true"></i> Unsubscribe from email alerts</button>
                                             </form>
                                         </td>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt
index 57b221735c..ed9819ad20 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt
@@ -33,7 +33,7 @@
                     <div id="userauthhome" class="maincontent">
                         <form name="f" action="/cgi-bin/koha/opac-authorities-home.pl" method="post">
                             [% INCLUDE 'csrf-token.inc' %]
-                            <input type="hidden" name="op-cud" value="do_search" />
+                            <input type="hidden" name="op" value="cud-do_search" />
                             <input type="hidden" name="type" value="opac" />
                             <fieldset class="rows">
                                 <legend><h1>Authority search</h1></legend>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt
index bb7b0846db..03c7bc7999 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt
@@ -185,7 +185,7 @@
                                                     <td>
                                                         <form method="post">
                                                             [% INCLUDE 'csrf-token.inc' %]
-                                                            <input type="hidden" name="op-cud" value="arrival-alert" />
+                                                            <input type="hidden" name="op" value="cud-arrival-alert" />
                                                             <input type="hidden" name="pickup_id" value="[% p.id | html %]" />
                                                             [% IF ! p.staged_datetime || p.arrival_datetime %]
                                                             <button class="btn disabled" disabled href="#" >
@@ -198,7 +198,7 @@
                                                         <p>
                                                         <form method="post">
                                                             [% INCLUDE 'csrf-token.inc' %]
-                                                            <input type="hidden" name="op-cud" value="cancel-pickup" />
+                                                            <input type="hidden" name="op" value="cud-cancel-pickup" />
                                                             <input type="hidden" name="pickup_id" value="[% p.id | html %]" />
                                                             [% IF p.delivered_datetime %]
                                                                 <button class="btn disabled" disabled href="#" >
@@ -256,7 +256,7 @@
                                         </fieldset>
 
                                         <fieldset class="action">
-                                            <input type="hidden" name="op-cud" value="create-pickup" />
+                                            <input type="hidden" name="op" value="cud-create-pickup" />
                                             <input type="submit" id="schedule-pickup-button" class="btn btn-default" disabled value="Schedule pickup" />
                                         </fieldset>
                                     </form>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
index 0962e991d4..6f0efe4e21 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
@@ -91,7 +91,7 @@
                                     </div>
                                 </fieldset>
                                 <fieldset class="action">
-                                    <input type="hidden" name="op-cud" value="change_password" />
+                                    <input type="hidden" name="op" value="cud-change_password" />
                                     <input type="submit" value="Change password" class="btn btn-primary" />
                                     <a href="/cgi-bin/koha/opac-user.pl" class="cancel">Cancel</a>
                                 </fieldset>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
index 295da6e4be..76cecde770 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
@@ -34,7 +34,7 @@
                 <div id="patronconsents" class="maincontent">
                     <form action="/cgi-bin/koha/opac-patron-consent.pl" method="post">
                         [% INCLUDE 'csrf-token.inc' %]
-                        <input type="hidden" name="op-cud" value="save"/>
+                        <input type="hidden" name="op" value="cud-save"/>
                         <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]"/>
                         <h1>Your consents</h1>
                         [% FOREACH consent IN consents %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
index 9ed3e780a3..94728486f0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
@@ -72,7 +72,7 @@
                         <form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-update-form">
                             [% INCLUDE 'csrf-token.inc' %]
                             <legend class="sr-only">Privacy rule</legend>
-                            <input type="hidden" name="op-cud" value="update_privacy" />
+                            <input type="hidden" name="op" value="cud-update_privacy" />
                             <fieldset>
                                 <label for="privacy">Please choose your privacy rule:</label>
                                 <div class="form-group row">
@@ -155,19 +155,19 @@
 
                         <form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-delete-checkouts">
                             [% INCLUDE 'csrf-token.inc' %]
-                            <input type="hidden" name="op-cud" value="delete_record" />
+                            <input type="hidden" name="op" value="cud-delete_record" />
                             <input type="hidden" name="checkouts" value="1" />
                         </form>
 
                         <form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-delete-holds">
                             [% INCLUDE 'csrf-token.inc' %]
-                            <input type="hidden" name="op-cud" value="delete_record" />
+                            <input type="hidden" name="op" value="cud-delete_record" />
                             <input type="hidden" name="holds" value="1" />
                         </form>
 
                         <form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-delete-all">
                             [% INCLUDE 'csrf-token.inc' %]
-                            <input type="hidden" name="op-cud" value="delete_record" />
+                            <input type="hidden" name="op" value="cud-delete_record" />
                             <input type="hidden" name="all" value="1" />
                         </form>
                         <table class="table table-bordered table-condensed table-striped">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
index 2e244a716a..136221db06 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
@@ -158,7 +158,7 @@
                                             </table>
                                         </fieldset>
                                         <fieldset class="action">
-                                            <input type="hidden" name="op-cud" value="request">
+                                            <input type="hidden" name="op" value="cud-request">
                                             <input type="hidden" name="biblionumber" value="[% biblio.biblionumber | html %]">
                                             <input type="submit" class="btn btn-primary" value="Confirm">
                                             <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | uri %]" class="cancel">Cancel</a>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt
index 9fcf83c663..95272ac2a0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt
@@ -114,7 +114,7 @@
                                                         [% IF ( RECALL.requested or RECALL.overdue ) %]
                                                             <form action="/cgi-bin/koha/opac-recall.pl" method="post">
                                                                 [% INCLUDE 'csrf-token.inc' %]
-                                                                <input type="hidden" name="op-cud" value="cancel">
+                                                                <input type="hidden" name="op" value="cud-cancel">
                                                                 <input type="hidden" name="recall_id" value="[% RECALL.id | html %]">
                                                                 <input type="hidden" name="biblionumber" value="[% RECALL.biblio_id | html %]">
                                                                 <input type="submit" name="submit" class="btn btn-danger cancel_recall" value="Cancel">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt
index 4c41207934..4f4b7f7e23 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt
@@ -65,7 +65,7 @@
                         <form name="reportlibform" action="/cgi-bin/koha/opac-reportproblem.pl" method="post">
                             [% INCLUDE 'csrf-token.inc' %]
                             <legend class="sr-only">Report a problem</legend>
-                            <input type="hidden" name="op-cud" value="addreport" />
+                            <input type="hidden" name="op" value="cud-addreport" />
                             <fieldset class="rows">
                                 <ol>
                                     <li>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt
index 04f647231c..c433c72cdb 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt
@@ -93,7 +93,7 @@
                                 <fieldset class="action">
                                     <input type="submit" value="Update password" class="btn btn-primary" />
                                 </fieldset>
-                                <input type="hidden" name="op-cud" value="update" />
+                                <input type="hidden" name="op" value="cud-update" />
                             </fieldset>
                             [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
                                 <div id="resetpassword">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index a8ecc0412e..950aa6f77c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -11,7 +11,7 @@
 [% BLOCK delete_shelf %]
     <form action="/cgi-bin/koha/opac-shelves.pl" method="post" id="deleteshelf[% shelf.shelfnumber | html %]" class="d-inline">
         [% INCLUDE 'csrf-token.inc' %]
-        <input type="hidden" name="op-cud" value="delete" />
+        <input type="hidden" name="op" value="cud-delete" />
         <input type="hidden" name="referer" value="list" />
         <input type='hidden' name='public' value='[% public | html %]' />
         <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
@@ -247,7 +247,7 @@
                                             <span class="sep">|</span>
                                             <form method="post" action="/cgi-bin/koha/opac-shelves.pl" class="d-inline">
                                                 [% INCLUDE 'csrf-token.inc' %]
-                                                <input type="hidden" name="op-cud" value="edit_form" />
+                                                <input type="hidden" name="op" value="cud-edit_form" />
                                                 <input type="hidden" name="referer" value="view" />
                                                 <input type='hidden' name='public' value='[% shelf.public | html %]' />
                                                 <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
@@ -262,7 +262,7 @@
                                         [% ELSIF !public # not manageshelf and private means shared %]
                                             <form action="/cgi-bin/koha/opac-shelves.pl" method="post" id="unshare[% shelf.shelfnumber | html %]" class="d-inline">
                                                 [% INCLUDE 'csrf-token.inc' %]
-                                                <input type="hidden" name="op-cud" value="remove_share" />
+                                                <input type="hidden" name="op" value="cud-remove_share" />
                                                 <input type="hidden" name="referer" value="list" />
                                                 <input type='hidden' name='public' value='[% public | html %]' />
                                                 <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
@@ -393,7 +393,7 @@
                             <form action="/cgi-bin/koha/opac-shelves.pl" method="post" id="myform" name="bookbag_form">
                                 [% INCLUDE 'csrf-token.inc' %]
                                 [% IF can_manage_shelf %]
-                                    <input type="hidden" name="op-cud" value="remove_biblios" />
+                                    <input type="hidden" name="op" value="cud-remove_biblios" />
                                     <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
                                 [% END %]
                                 <div class="searchresults">
@@ -542,7 +542,7 @@
                                 [% END %]
 
                                 [% IF can_remove_biblios %]
-                                    <input type="hidden" name="op-cud" value="remove_biblios" />
+                                    <input type="hidden" name="op" value="cud-remove_biblios" />
                                     <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
                                     <input type="hidden" name="modifyshelfcontents" value="1" />
                                     <input type="submit" value="Remove selected items" id="remove-selected" class="btn btn-danger removeitems"/>
@@ -556,7 +556,7 @@
                                         <span class="sep">|</span>
                                         <form method="post" action="/cgi-bin/koha/opac-shelves.pl" class="d-inline">
                                             [% INCLUDE 'csrf-token.inc' %]
-                                            <input type="hidden" name="op-cud" value="edit_form" />
+                                            <input type="hidden" name="op" value="cud-edit_form" />
                                             <input type="hidden" name="referer" value="view" />
                                             <input type="hidden" name="public" value="[% shelf.public | html %]" />
                                             <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
@@ -586,10 +586,10 @@
                                 [% IF op == 'add_form' %]
                                     <div id="addshelf">
                                         <legend><h1>Create a new list</h1></legend>
-                                    <input type="hidden" name="op-cud" value="add" />
+                                    <input type="hidden" name="op" value="cud-add" />
                                 [% ELSE %]
                                 <legend><h1>Editing <em>[% shelf.shelfname | html %]</em></h1></legend>
-                                    <input type="hidden" name="op-cud" value="edit" />
+                                    <input type="hidden" name="op" value="cud-edit" />
                                     <input type="hidden" name="referer" value="[% referer | html %]" />
                                     <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
                                 [% END %]
@@ -672,7 +672,7 @@
                         <form action="/cgi-bin/koha/opac-shelves.pl" id="transferform" method="post">
                             [% INCLUDE 'csrf-token.inc' %]
                         <fieldset>
-                            <input type="hidden" name="op-cud" value="transfer" />
+                            <input type="hidden" name="op" value="cud-transfer" />
                             <input type="hidden" name="public" value="0" />
                             <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
                             <div>
@@ -770,7 +770,7 @@
                                                                 [% INCLUDE 'csrf-token.inc' %]
                                                                 <input type="hidden" name="shelfnumber" value="[% s.shelfnumber | html %]" />
                                                                 <input type="hidden" name="public" value="[% s.public | html %]" />
-                                                                <input type="hidden" name="op-cud" value="edit_form" />
+                                                                <input type="hidden" name="op" value="cud-edit_form" />
                                                                 <input type="hidden" name="referer" value="list" />
                                                                 <button type="submit" class="btn btn-link editshelf"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</button>
                                                             </form>
@@ -786,7 +786,7 @@
                                                                 [% INCLUDE 'csrf-token.inc' %]
                                                                 <input type="hidden" name="shelfnumber" value="[% s.shelfnumber | html %]" />
                                                                 <input type="hidden" name="public" value="0" />
-                                                                <input type="hidden" name="op-cud" value="transfer" />
+                                                                <input type="hidden" name="op" value="cud-transfer" />
                                                                 <input type="hidden" name="referer" value="list" />
                                                                 <button type="submit" class="btn btn-link transfershelf"> Transfer</button>
                                                             </form>
@@ -794,7 +794,7 @@
                                                         [% IF s.is_shared_with( loggedinusernumber ) %]
                                                             <form action="opac-shelves.pl" method="post" id="unshare[% s.shelfnumber | html %]" class="d-inline">
                                                                 [% INCLUDE 'csrf-token.inc' %]
-                                                                <input type="hidden" name="op-cud" value="remove_share" />
+                                                                <input type="hidden" name="op" value="cud-remove_share" />
                                                                 <input type="hidden" name="referer" value="list" />
                                                                 <input type='hidden' name='public' value='[% public | html %]' />
                                                                 <input type="hidden" name="shelfnumber" value="[% s.shelfnumber | html %]" />
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
index e96947fce3..46bf965697 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
@@ -291,14 +291,14 @@
                                 <fieldset class="action">
                                     <input type="hidden" name="suggested_by_anyone" value="[% suggested_by_anyone | html %]" />
                                     [% IF need_confirm # Confirm that we want a duplicate %]
-                                        <input type="hidden" name="op-cud" value="add_confirm" />
+                                        <input type="hidden" name="op" value="cud-add_confirm" />
                                         <input type="submit" class="btn btn-primary" value="Confirm your suggestion" />
                                     [% ELSIF biblionumber # Create from an existing title %]
-                                        <input type="hidden" name="op-cud" value="add_confirm" />
+                                        <input type="hidden" name="op" value="cud-add_confirm" />
                                         <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
                                         <input type="submit" class="btn btn-primary" value="Submit your suggestion" />
                                     [% ELSE # Not created from an existing title, search for possible duplicate %]
-                                        <input type="hidden" name="op-cud" value="add_validate" />
+                                        <input type="hidden" name="op" value="cud-add_validate" />
                                         <input type="submit" class="btn btn-primary" value="Submit your suggestion" />
                                     [% END %]
                                     <a class="action" href="/cgi-bin/koha/opac-suggestions.pl">Cancel</a>
@@ -374,7 +374,7 @@
                                 [% SET can_delete_suggestion = 0 %]
                                 <form action="/cgi-bin/koha/opac-suggestions.pl" method="post" id="delete_suggestions">
                                     [% INCLUDE 'csrf-token.inc' %]
-                                    <input type="hidden" name="op-cud" value="delete_confirm" />
+                                    <input type="hidden" name="op" value="cud-delete_confirm" />
                                     [% IF ( loggedinusername || ( Koha.Preference( 'AnonSuggestions' ) == 1 ) ) %]
                                         <div id="toolbar" class="toolbar clearfix">
                                         [% IF ( Koha.Preference('MaxTotalSuggestions') != '' && patrons_total_suggestions_count >= Koha.Preference('MaxTotalSuggestions') ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index 9b74825aa3..ec48676418 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -554,7 +554,7 @@
                                             [% INCLUDE 'csrf-token.inc' %]
                                             <legend class="sr-only">Renew</legend>
                                             <input type="hidden" name="from" value="opac_user" />
-                                            <input type="hidden" name="op-cud" value="renew" />
+                                            <input type="hidden" name="op" value="cud-renew" />
                                             <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
                                             [% FOREACH ISSUE IN ISSUES %]
                                                 [% IF ISSUE.status %]
@@ -898,7 +898,7 @@
                                                     [% IF ( RECALL.requested or RECALL.overdue ) %]
                                                         <form action="/cgi-bin/koha/opac-recall.pl" method="post">
                                                             [% INCLUDE 'csrf-token.inc' %]
-                                                            <input type="hidden" name="op-cud" value="cancel">
+                                                            <input type="hidden" name="op" value="cud-cancel">
                                                             <input type="hidden" name="recall_id" value="[% RECALL.id | html %]">
                                                             <input type="hidden" name="biblionumber" value="[% RECALL.biblio_id | html %]">
                                                             <button type="submit" name="submit" class="btn btn-sm btn-danger cancel_recall"><i class="fa fa-times" aria-hidden="true"></i> Cancel</button>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
index 2e07a6ae15..03b138a156 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
@@ -152,7 +152,7 @@
                                                 </tbody>
                                             </table> <!-- /#sci_barcodes_table -->
                                         </div> <!-- .sci_input_append -->
-                                        <input type="hidden" name="op-cud" value="check_in" />
+                                        <input type="hidden" name="op" value="cud-check_in" />
                                         <div id="button_bar">
                                             <button id="sci_checkin_button" type="submit" class="btn btn-primary" style="display: none;">
                                                 <i class="fa fa-check-square" aria-hidden="true"></i> <span>Check in</span>
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 7666c3ebfe..58da120e71 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
@@ -106,7 +106,7 @@
                                 <form action="/cgi-bin/koha/sco/sco-main.pl" name="errorForm" class="inline" method="post">
                                     [% INCLUDE 'csrf-token.inc' %]
                                     <legend class="sr-only">Return</legend>
-                                    <input type="hidden" name="op-cud" value="returnbook" />
+                                    <input type="hidden" name="op" value="cud-returnbook" />
                                     <input type="hidden" name="patronid" value="[% patronid | html %]" />
                                     <input type="hidden" name="barcode" value="[% barcode | html %]" />
                                     <input type="hidden" name="load_checkouts" value="[% load_checkouts | html %]" />
@@ -118,7 +118,7 @@
                             <form action="/cgi-bin/koha/sco/sco-main.pl" name="errorForm" class="inline" method="post">
                                 [% INCLUDE 'csrf-token.inc' %]
                                 <legend class="sr-only">Error</legend>
-                                <input type="hidden" name="op-cud" value="" />
+                                <input type="hidden" name="op" value="" />
                                 <input type="hidden" name="patronid" value="[% patronid | html %]" />
                                 <input type="hidden" name="barcode" value="[% barcode | html %]" />
                                 <input type="hidden" name="load_checkouts" value="[% load_checkouts | html %]" />
@@ -139,7 +139,7 @@
                                 <form action="/cgi-bin/koha/sco/sco-main.pl" name="confirmForm" class="inline" method="post">
                                     [% INCLUDE 'csrf-token.inc' %]
                                     <legend class="sr-only">Return</legend>
-                                    <input type="hidden" name="op-cud" value="returnbook" />
+                                    <input type="hidden" name="op" value="cud-returnbook" />
                                     <input type="hidden" name="patronid" value="[% patronid | html %]" />
                                     <input type="hidden" name="barcode" value="[% barcode | html %]" />
                                     <input type="hidden" name="load_checkouts" value="[% load_checkouts | html %]" />
@@ -153,7 +153,7 @@
                                 <form action="/cgi-bin/koha/sco/sco-main.pl" name="confirmForm" class="inline" method="post">
                                     [% INCLUDE 'csrf-token.inc' %]
                                     <legend class="sr-only">Renew</legend>
-                                    <input type="hidden" name="op-cud" value="renew" />
+                                    <input type="hidden" name="op" value="cud-renew" />
                                     <input type="hidden" name="patronid" value="[% patronid | html %]" />
                                     <input type="hidden" name="barcode" value="[% barcode | html %]" />
                                     <input type="hidden" name="load_checkouts" value="[% load_checkouts | html %]" />
@@ -165,7 +165,7 @@
                                 <form action="/cgi-bin/koha/sco/sco-main.pl" name="confirmForm" class="inline" method="post">
                                     [% INCLUDE 'csrf-token.inc' %]
                                     <legend class="sr-only">Renew</legend>
-                                    <input type="hidden" name="op-cud" value="renew" />
+                                    <input type="hidden" name="op" value="cud-renew" />
                                     <input type="hidden" name="patronid" value="[% patronid | html %]" />
                                     <input type="hidden" name="barcode" value="[% barcode | html %]" />
                                     <input type="hidden" name="load_checkouts" value="[% load_checkouts | html %]" />
@@ -178,7 +178,7 @@
                             <form action="/cgi-bin/koha/sco/sco-main.pl" name="confirmForm" class="inline" method="post">
                                 [% INCLUDE 'csrf-token.inc' %]
                                 <legend class="sr-only">Cancel</legend>
-                                <input type="hidden" name="op-cud" value="" />
+                                <input type="hidden" name="op" value="" />
                                 <input type="hidden" name="patronid" value="[% patronid | html %]" />
                                 <input type="hidden" name="load_checkouts" value="[% load_checkouts | html %]" />
                                 <input type="hidden" name="newissues" value="[% newissues | html %]" />
@@ -284,7 +284,7 @@
                                         </div>
                                         <div class="col ml-auto">
                                             <button type="button" id="logout_form" class="btn btn-info"><i class="fa fa-check" aria-hidden="true"></i> Finish</button>
-                                            <input type="hidden" name="op-cud" value="checkout" />
+                                            <input type="hidden" name="op" value="cud-checkout" />
                                             <input type="hidden" name="patronid" value="[% patronid | html %]" />
                                             <input type="hidden" name="load_checkouts" value="[% load_checkouts | html %]" />
                                             <input type="hidden" name="newissues" value="[% newissues | html %]" />
@@ -391,7 +391,7 @@
                                                             <input type="hidden" name="barcode" value="[% ISSUE.barcode | html %]" />
                                                             <input type="hidden" name="newissues" value="[% newissues | html %]" />
                                                             [% IF ISSUE.can_be_renewed %]
-                                                                <input type="hidden" name="op-cud" value="renew" />
+                                                                <input type="hidden" name="op" value="cud-renew" />
                                                                 <input type="hidden" name="confirmed" value="1" />
                                                                 [% UNLESS ( ISSUE.renew ) %]
                                                                     <input type="submit" value="Renew item"  name="confirm  " class="btn btn-primary btn-sm renew" />
@@ -411,7 +411,7 @@
                                                                 [% IF Koha.Preference('SCOAllowCheckin') %]
                                                                     <div>
                                                                         <input type="submit" value="Check in item" name="confirm" class="btn btn-info btn-sm return" />
-                                                                        <input type="hidden" name="op-cud" value="returnbook" />
+                                                                        <input type="hidden" name="op" value="cud-returnbook" />
                                                                         <input type="hidden" name="confirmed" value=""  />
                                                                     </div>
                                                                 [% END %]
@@ -481,7 +481,7 @@
                                         [% FOREACH INPUT IN INPUTS %]
                                             <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]">
                                         [% END %]
-                                        <input type="hidden" name="op-cud" value="login" />
+                                        <input type="hidden" name="op" value="cud-login" />
                                     </fieldset>
                                 </form>
                             </div> <!-- / .sco_entry -->
-- 
2.39.5