diff --git a/roles/bodhi2/base/templates/staging.ini.j2 b/roles/bodhi2/base/templates/staging.ini.j2
index 614c639263..2a5b686e21 100644
--- a/roles/bodhi2/base/templates/staging.ini.j2
+++ b/roles/bodhi2/base/templates/staging.ini.j2
@@ -118,8 +118,8 @@ fedora_stable_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/upd
 fedora_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%s-updates-testing/compose/Everything/%s/os/repodata/repomd.xml
 fedora_epel_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/%s/%s/repodata/repomd.xml
 fedora_epel_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/testing/%s/%s/repodata/repomd.xml
-modular_fedora_stable_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%s-modular-updates/compose/Everything/%s/os/repodata/repomd.xml
-modular_fedora_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%s-modular-updates-testing/compose/Everything/%s/os/repodata/repomd.xml
+fedora_modular_stable_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%s-modular-updates/compose/Everything/%s/os/repodata/repomd.xml
+fedora_modular_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%s-modular-updates-testing/compose/Everything/%s/os/repodata/repomd.xml
 
 # {release}_{request}_alt_master_repomd: This is used by the masher to determine when a
 #     secondary architecture push has been synchronized to the master mirror for a given release and
@@ -187,8 +187,8 @@ fedora_announce_list = package-announce@lists.fedoraproject.org
 fedora_test_announce_list = test@lists.fedoraproject.org
 fedora_epel_announce_list = epel-package-announce@lists.fedoraproject.org
 fedora_epel_test_announce_list = epel-devel@lists.fedoraproject.org
-modular_fedora_announce_list = package-announce@lists.fedoraproject.org
-modular_fedora_test_announce_list = test@lists.fedoraproject.org
+fedora_modular_announce_list = package-announce@lists.fedoraproject.org
+fedora_modular_test_announce_list = test@lists.fedoraproject.org
 
 # Superuser groups
 admin_groups = proventesters security_respons bodhiadmin sysadmin-main
@@ -359,7 +359,7 @@ critpath.stable_after_days_without_negative_karma = 14
 # it can reach the stable repository
 fedora.mandatory_days_in_testing = 7
 fedora_epel.mandatory_days_in_testing = 14
-modular_fedora.mandatory_days_in_testing = 7
+fedora_modular.mandatory_days_in_testing = 7
 
 ##
 ## Release status