diff --git a/app/javascript/controllers/armed_forces_controller.js b/app/javascript/controllers/conditional_controller.js
similarity index 100%
rename from app/javascript/controllers/armed_forces_controller.js
rename to app/javascript/controllers/conditional_controller.js
diff --git a/app/views/form/_radio_question.html.erb b/app/views/form/_radio_question.html.erb
index b47b12dd5..0c704bb1d 100644
--- a/app/views/form/_radio_question.html.erb
+++ b/app/views/form/_radio_question.html.erb
@@ -8,8 +8,8 @@
         <%= f.govuk_radio_divider %>
       <% elsif question["conditional_for"] %>
         <%= f.govuk_radio_button question_key, key, label: { text: val },
-            "data-controller": "#{question_key.dasherize}",
-            "data-action": "click->#{question_key.dasherize}#displayConditional",
+            "data-controller": "conditional",
+            "data-action": "click->conditional#displayConditional",
             "data-info": "#{question["conditional_for"].to_json}"
         %>
       <% else %>