From 95246d0034a0cf4b94946529e31694b9073a862e Mon Sep 17 00:00:00 2001
From: Ole Herman Schumacher Elgesem <ole@northern.tech>
Date: Thu, 30 Apr 2026 22:23:01 +0200
Subject: [PATCH] Renamed default.cf.sub and dcs.cf.sub to .sub.cf

Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>
---
 .../00_basics/def.json/control_common_bundlesequence_end.cf | 2 +-
 tests/acceptance/00_basics/def.json/inputs.cf               | 2 +-
 tests/acceptance/09_services/unsafe/running_repaired.cf     | 2 +-
 .../01_init/unsafe/timed/001-prepare-repositories.cf        | 2 +-
 .../17_packages/10_new/unsafe/the_great_package_test.cf     | 2 +-
 .../10_new/unsafe/the_great_package_test_generator.py       | 2 +-
 .../17_packages/11_old/unsafe/11_packagesmatching.cf        | 2 +-
 .../17_packages/11_old/unsafe/12_packagesmatching.cf        | 2 +-
 .../17_packages/11_old/unsafe/named_multi_pkg_absent.cf     | 3 +--
 .../17_packages/11_old/unsafe/named_multi_pkg_present.cf    | 2 +-
 .../17_packages/11_old/unsafe/named_multi_pkg_upgrade.cf    | 2 +-
 .../17_packages/11_old/unsafe/named_pkg_absent.cf           | 3 +--
 .../17_packages/11_old/unsafe/named_pkg_file_present.cf     | 4 +---
 .../17_packages/11_old/unsafe/named_pkg_file_upgrade.cf     | 4 +---
 .../17_packages/11_old/unsafe/named_pkg_present.cf          | 2 +-
 .../17_packages/11_old/unsafe/named_pkg_upgrade.cf          | 2 +-
 .../11_old/unsafe/named_versioned_pkg_present.cf            | 4 +---
 .../11_old/unsafe/named_versioned_pkg_upgrade.cf            | 2 +-
 .../17_packages/11_old/unsafe/package-inventory.cf          | 2 +-
 .../11_old/unsafe/staging/named_pkg_same_version_kept.cf    | 2 +-
 .../11_old/unsafe/staging/named_versioned_pkg_absent.cf     | 5 +----
 .../unsafe/timed/inventory_packages_update_frequency.cf     | 2 +-
 .../17_packages/12_new/timed/installed-list-cached.cf       | 2 +-
 .../17_packages/12_new/timed/installed-list-cached.cf.sub   | 2 +-
 .../17_packages/12_new/timed/local-updates-list-cached.cf   | 2 +-
 .../12_new/timed/local-updates-list-cached.cf.sub           | 2 +-
 .../acceptance/17_packages/12_new/timed/packagesmatching.cf | 3 +--
 .../17_packages/12_new/timed/updates-list-cached.cf         | 2 +-
 .../17_packages/12_new/timed/updates-list-cached.cf.sub     | 2 +-
 tests/acceptance/17_packages/multiline_yum_check_update.cf  | 4 ++--
 .../30_custom_promise_types/05_cp_using_library.cf          | 2 +-
 .../30_custom_promise_types/06_cp_with_classes.cf           | 2 +-
 .../acceptance/30_custom_promise_types/07_python_library.cf | 2 +-
 tests/acceptance/30_custom_promise_types/08_slist_attrs.cf  | 2 +-
 tests/acceptance/30_custom_promise_types/09_log_level.cf    | 2 +-
 .../acceptance/30_custom_promise_types/09_log_level.cf.sub  | 2 +-
 .../30_custom_promise_types/10_log_level_bad_module.cf      | 2 +-
 .../30_custom_promise_types/10_log_level_bad_module.cf.sub  | 2 +-
 tests/acceptance/30_custom_promise_types/11_handle.cf       | 2 +-
 tests/acceptance/30_custom_promise_types/16_data_attrs.cf   | 2 +-
 .../30_custom_promise_types/19_different_promise_types.cf   | 2 +-
 tests/acceptance/30_custom_promise_types/20_depends_on.cf   | 2 +-
 .../acceptance/30_custom_promise_types/21_with_attribute.cf | 2 +-
 tests/acceptance/30_custom_promise_types/22_bodies.cf       | 2 +-
 .../30_custom_promise_types/22_single_evaluation.cf         | 2 +-
 tests/acceptance/30_custom_promise_types/23_comment.cf      | 2 +-
 tests/acceptance/30_custom_promise_types/24_expireafter.cf  | 2 +-
 .../30_custom_promise_types/24_expireafter.cf.sub           | 2 +-
 .../25_top_down_evaluation_custom_promise_types.cf          | 2 +-
 tests/acceptance/Makefile.am                                | 3 +--
 tests/acceptance/README.org                                 | 6 +++---
 tests/acceptance/lib/bundles/run_ifdefined.cf               | 2 +-
 tests/acceptance/lib/common/always.cf                       | 2 +-
 tests/acceptance/lib/files/CFE-1710.cf                      | 2 +-
 tests/acceptance/lib/files/append_user_field.cf             | 2 +-
 tests/acceptance/lib/files/edit_line_converge.cf            | 4 ++--
 tests/acceptance/lib/files/edit_line_converge_prepend.cf    | 4 ++--
 tests/acceptance/lib/files/insert_ini_section.cf            | 2 +-
 tests/acceptance/lib/files/manage_variable_values_ini.cf    | 2 +-
 .../lib/files/manage_variable_values_ini_metachar.cf        | 2 +-
 .../acceptance/lib/files/replace_uncommented_substrings.cf  | 4 ++--
 tests/acceptance/lib/files/set_config_values.cf             | 2 +-
 tests/acceptance/lib/files/set_line_based-ENT-5866.cf       | 2 +-
 tests/acceptance/lib/files/set_line_based_config_values.cf  | 2 +-
 .../acceptance/lib/files/set_line_based_variable_values.cf  | 2 +-
 tests/acceptance/lib/files/set_variable_values.cf           | 2 +-
 tests/acceptance/lib/files/set_variable_values_ini.cf       | 2 +-
 .../lib/files/set_variable_values_ini_missing_section.cf    | 2 +-
 tests/acceptance/lib/reports/cat.cf                         | 2 +-
 tests/acceptance/lib/reports/head.cf                        | 2 +-
 tests/acceptance/lib/reports/head_n.cf                      | 2 +-
 tests/acceptance/lib/reports/tail.cf                        | 2 +-
 tests/acceptance/lib/reports/tail_n.cf                      | 2 +-
 tests/acceptance/promises/autorun-D.cf                      | 2 +-
 tests/acceptance/promises/autorun-def_json.cf               | 2 +-
 tests/acceptance/promises/autorun.cf                        | 2 +-
 tests/acceptance/promises/promises.cf                       | 2 +-
 77 files changed, 83 insertions(+), 96 deletions(-)

diff --git a/tests/acceptance/00_basics/def.json/control_common_bundlesequence_end.cf b/tests/acceptance/00_basics/def.json/control_common_bundlesequence_end.cf
index 62ad6f5a8e..255febd1e1 100644
--- a/tests/acceptance/00_basics/def.json/control_common_bundlesequence_end.cf
+++ b/tests/acceptance/00_basics/def.json/control_common_bundlesequence_end.cf
@@ -3,7 +3,7 @@
 
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
diff --git a/tests/acceptance/00_basics/def.json/inputs.cf b/tests/acceptance/00_basics/def.json/inputs.cf
index b3af8eeda6..eeb1353400 100644
--- a/tests/acceptance/00_basics/def.json/inputs.cf
+++ b/tests/acceptance/00_basics/def.json/inputs.cf
@@ -7,7 +7,7 @@
 
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
diff --git a/tests/acceptance/09_services/unsafe/running_repaired.cf b/tests/acceptance/09_services/unsafe/running_repaired.cf
index a46c6de59d..580b9934d8 100644
--- a/tests/acceptance/09_services/unsafe/running_repaired.cf
+++ b/tests/acceptance/09_services/unsafe/running_repaired.cf
@@ -10,7 +10,7 @@ vars:
 
 body common control
 {
-      inputs => { "../../dcs.cf.sub",
+      inputs => { "../../dcs.sub.cf",
                   "../../../../$(sys.local_libdir)/stdlib.cf",
                   "service_common.cf.sub"
                 };
diff --git a/tests/acceptance/17_packages/01_init/unsafe/timed/001-prepare-repositories.cf b/tests/acceptance/17_packages/01_init/unsafe/timed/001-prepare-repositories.cf
index 7f0d3ab486..b153624327 100644
--- a/tests/acceptance/17_packages/01_init/unsafe/timed/001-prepare-repositories.cf
+++ b/tests/acceptance/17_packages/01_init/unsafe/timed/001-prepare-repositories.cf
@@ -9,7 +9,7 @@
 
 body common control
 {
-  inputs => { "../../../../dcs.cf.sub",
+  inputs => { "../../../../dcs.sub.cf",
               "../../../../../../$(sys.local_libdir)/files.cf",
               "../../../../../../$(sys.local_libdir)/commands.cf",
               "../../../packages-info.cf.sub",
diff --git a/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test.cf b/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test.cf
index d89b35bfe2..f38ed9da1a 100644
--- a/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test.cf
+++ b/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test.cf
@@ -11,7 +11,7 @@
 
 body common control
 {
-    inputs => { "../../../dcs.cf.sub",
+    inputs => { "../../../dcs.sub.cf",
                 "../../../../../controls/def.cf",
                 "../../../../../$(sys.local_libdir)/packages.cf",
                 "../../../../../$(sys.local_libdir)/commands.cf",
diff --git a/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test_generator.py b/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test_generator.py
index cc144d8a49..962a8ca9e0 100755
--- a/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test_generator.py
+++ b/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test_generator.py
@@ -97,7 +97,7 @@ def header(test_count):
 
 body common control
 {
-    inputs => { "../../../dcs.cf.sub",
+    inputs => { "../../../dcs.sub.cf",
                 "../../../../../controls/def.cf",
                 "../../../../../$(sys.local_libdir)/packages.cf",
                 "../../../../../$(sys.local_libdir)/commands.cf",
diff --git a/tests/acceptance/17_packages/11_old/unsafe/11_packagesmatching.cf b/tests/acceptance/17_packages/11_old/unsafe/11_packagesmatching.cf
index b63b886ab4..cd61f56353 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/11_packagesmatching.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/11_packagesmatching.cf
@@ -10,7 +10,7 @@
 body common control
 {
       inputs => { "../../packages-info.cf.sub",
-                  "../../../dcs.cf.sub",
+                  "../../../dcs.sub.cf",
                   "../../../../../$(sys.local_libdir)/stdlib.cf",
                   "../../../../../$(sys.local_libdir)/packages.cf"
                 };
diff --git a/tests/acceptance/17_packages/11_old/unsafe/12_packagesmatching.cf b/tests/acceptance/17_packages/11_old/unsafe/12_packagesmatching.cf
index af0e4c4c4c..d414dea781 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/12_packagesmatching.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/12_packagesmatching.cf
@@ -18,7 +18,7 @@ body common control
 {
       inputs => { "../../packages-info.cf.sub",
                   "../../meta_skip.cf.sub",
-                  "../../../dcs.cf.sub",
+                  "../../../dcs.sub.cf",
                   "../../../../../inventory/any.cf",
                   "../../../../../$(sys.local_libdir)/stdlib.cf",
                   "../../../../../$(sys.local_libdir)/packages.cf",
diff --git a/tests/acceptance/17_packages/11_old/unsafe/named_multi_pkg_absent.cf b/tests/acceptance/17_packages/11_old/unsafe/named_multi_pkg_absent.cf
index 78b291804c..f22de1de0c 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/named_multi_pkg_absent.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/named_multi_pkg_absent.cf
@@ -11,7 +11,7 @@ bundle common test_meta
 body common control
 {
     inputs => {
-                "../../../dcs.cf.sub",
+                "../../../dcs.sub.cf",
                 "../../../../../$(sys.local_libdir)/stdlib.cf",
                 "../../../../../$(sys.local_libdir)/packages.cf",
                 "../../packages-info.cf.sub",
@@ -132,4 +132,3 @@ body classes succesfully_executed(class)
     kept_returncodes => { "0" };
     promise_kept => { "$(class)" };
 }
-
diff --git a/tests/acceptance/17_packages/11_old/unsafe/named_multi_pkg_present.cf b/tests/acceptance/17_packages/11_old/unsafe/named_multi_pkg_present.cf
index 5c22b6dc5f..c3a5e911fb 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/named_multi_pkg_present.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/named_multi_pkg_present.cf
@@ -11,7 +11,7 @@ bundle common test_meta
 body common control
 {
     inputs => {
-                "../../../dcs.cf.sub",
+                "../../../dcs.sub.cf",
                 "../../../../../$(sys.local_libdir)/stdlib.cf",
                 "../../../../../$(sys.local_libdir)/packages.cf",
                 "../../packages-info.cf.sub",
diff --git a/tests/acceptance/17_packages/11_old/unsafe/named_multi_pkg_upgrade.cf b/tests/acceptance/17_packages/11_old/unsafe/named_multi_pkg_upgrade.cf
index eac188b227..b69e88591c 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/named_multi_pkg_upgrade.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/named_multi_pkg_upgrade.cf
@@ -7,7 +7,7 @@
 body common control
 {
     inputs => {
-                "../../../dcs.cf.sub",
+                "../../../dcs.sub.cf",
                 "../../../../../$(sys.local_libdir)/stdlib.cf",
                 "../../../../../$(sys.local_libdir)/packages.cf",
                 "../../packages-info.cf.sub",
diff --git a/tests/acceptance/17_packages/11_old/unsafe/named_pkg_absent.cf b/tests/acceptance/17_packages/11_old/unsafe/named_pkg_absent.cf
index 419dab16ee..5ceb1b4245 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/named_pkg_absent.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/named_pkg_absent.cf
@@ -11,7 +11,7 @@ bundle common test_meta
 body common control
 {
     inputs => {
-                "../../../dcs.cf.sub",
+                "../../../dcs.sub.cf",
                 "../../../../../$(sys.local_libdir)/stdlib.cf",
                 "../../../../../$(sys.local_libdir)/packages.cf",
                 "../../packages-info.cf.sub",
@@ -109,4 +109,3 @@ body classes succesfully_executed(class)
     kept_returncodes => { "0" };
     promise_kept => { "$(class)" };
 }
-
diff --git a/tests/acceptance/17_packages/11_old/unsafe/named_pkg_file_present.cf b/tests/acceptance/17_packages/11_old/unsafe/named_pkg_file_present.cf
index 6234d2b31d..8b353daddb 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/named_pkg_file_present.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/named_pkg_file_present.cf
@@ -7,7 +7,7 @@
 body common control
 {
     inputs => {
-                "../../../dcs.cf.sub",
+                "../../../dcs.sub.cf",
                 "../../../../../$(sys.local_libdir)/stdlib.cf",
                 "../../../../../$(sys.local_libdir)/packages.cf",
                 "../../packages-info.cf.sub",
@@ -96,5 +96,3 @@ bundle agent check
       !ok::
         "$(this.promise_filename) FAIL";
 }
-
-
diff --git a/tests/acceptance/17_packages/11_old/unsafe/named_pkg_file_upgrade.cf b/tests/acceptance/17_packages/11_old/unsafe/named_pkg_file_upgrade.cf
index e3a687dc3a..cf607ca7d6 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/named_pkg_file_upgrade.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/named_pkg_file_upgrade.cf
@@ -7,7 +7,7 @@
 body common control
 {
     inputs => {
-                "../../../dcs.cf.sub",
+                "../../../dcs.sub.cf",
                 "../../../../../$(sys.local_libdir)/stdlib.cf",
                 "../../../../../$(sys.local_libdir)/packages.cf",
                 "../../packages-info.cf.sub",
@@ -92,5 +92,3 @@ bundle agent check
       !ok::
         "$(this.promise_filename) FAIL";
 }
-
-
diff --git a/tests/acceptance/17_packages/11_old/unsafe/named_pkg_present.cf b/tests/acceptance/17_packages/11_old/unsafe/named_pkg_present.cf
index 75c2961158..a3b01b34fe 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/named_pkg_present.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/named_pkg_present.cf
@@ -11,7 +11,7 @@ bundle common test_meta
 body common control
 {
       inputs => {
-                 "../../../dcs.cf.sub",
+                 "../../../dcs.sub.cf",
                   "../../../../../$(sys.local_libdir)/stdlib.cf",
                   "../../../../../$(sys.local_libdir)/packages.cf",
                   "../../packages-info.cf.sub",
diff --git a/tests/acceptance/17_packages/11_old/unsafe/named_pkg_upgrade.cf b/tests/acceptance/17_packages/11_old/unsafe/named_pkg_upgrade.cf
index 249bb37cc6..3b007ee37a 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/named_pkg_upgrade.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/named_pkg_upgrade.cf
@@ -7,7 +7,7 @@
 body common control
 {
       inputs => {
-                  "../../../dcs.cf.sub",
+                  "../../../dcs.sub.cf",
                   "../../../../../$(sys.local_libdir)/stdlib.cf",
                   "../../../../../$(sys.local_libdir)/packages.cf",
                   "../../packages-info.cf.sub",
diff --git a/tests/acceptance/17_packages/11_old/unsafe/named_versioned_pkg_present.cf b/tests/acceptance/17_packages/11_old/unsafe/named_versioned_pkg_present.cf
index 0f21a7e040..7194fb0768 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/named_versioned_pkg_present.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/named_versioned_pkg_present.cf
@@ -7,7 +7,7 @@
 body common control
 {
     inputs => {
-                "../../../dcs.cf.sub",
+                "../../../dcs.sub.cf",
                 "../../../../../$(sys.local_libdir)/stdlib.cf",
                 "../../../../../$(sys.local_libdir)/packages.cf",
                 "../../packages-info.cf.sub",
@@ -105,5 +105,3 @@ body classes succesfully_executed(class)
     kept_returncodes => { "0" };
     promise_kept => { "$(class)" };
 }
-
-
diff --git a/tests/acceptance/17_packages/11_old/unsafe/named_versioned_pkg_upgrade.cf b/tests/acceptance/17_packages/11_old/unsafe/named_versioned_pkg_upgrade.cf
index 755aa4cf90..0dad12463c 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/named_versioned_pkg_upgrade.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/named_versioned_pkg_upgrade.cf
@@ -7,7 +7,7 @@
 body common control
 {
     inputs => {
-                "../../../dcs.cf.sub",
+                "../../../dcs.sub.cf",
                 "../../../../../$(sys.local_libdir)/stdlib.cf",
                 "../../../../../$(sys.local_libdir)/packages.cf",
                 "../../packages-info.cf.sub",
diff --git a/tests/acceptance/17_packages/11_old/unsafe/package-inventory.cf b/tests/acceptance/17_packages/11_old/unsafe/package-inventory.cf
index aaf40861e7..1c72e30426 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/package-inventory.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/package-inventory.cf
@@ -8,7 +8,7 @@ bundle common test_meta
 
 body common control
 {
-    inputs => { "../../../dcs.cf.sub",
+    inputs => { "../../../dcs.sub.cf",
                 "../../../../../$(sys.local_libdir)/stdlib.cf",
                 "../../../../../$(sys.local_libdir)/packages.cf",
                 "../../../../../inventory/any.cf",
diff --git a/tests/acceptance/17_packages/11_old/unsafe/staging/named_pkg_same_version_kept.cf b/tests/acceptance/17_packages/11_old/unsafe/staging/named_pkg_same_version_kept.cf
index a5074315d0..09e4c9c384 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/staging/named_pkg_same_version_kept.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/staging/named_pkg_same_version_kept.cf
@@ -8,7 +8,7 @@
 body common control
 {
       inputs => {
-                  "../../../default.cf.sub",
+                  "../../../default.sub.cf",
                   "../../../../../lib/3.6/packages.cf",
                   "../../packages-info.cf.sub",
       };
diff --git a/tests/acceptance/17_packages/11_old/unsafe/staging/named_versioned_pkg_absent.cf b/tests/acceptance/17_packages/11_old/unsafe/staging/named_versioned_pkg_absent.cf
index 61625a17bf..235017826f 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/staging/named_versioned_pkg_absent.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/staging/named_versioned_pkg_absent.cf
@@ -7,7 +7,7 @@
 body common control
 {
     inputs => {
-               "../../../default.cf.sub",
+               "../../../default.sub.cf",
                "../../../../../lib/3.6/packages.cf",
                "../../packages-info.cf.sub",
               };
@@ -121,6 +121,3 @@ body classes succesfully_executed(class)
     kept_returncodes => { "0" };
     promise_kept => { "$(class)" };
 }
-
-
-
diff --git a/tests/acceptance/17_packages/11_old/unsafe/timed/inventory_packages_update_frequency.cf b/tests/acceptance/17_packages/11_old/unsafe/timed/inventory_packages_update_frequency.cf
index cc13efaf43..8dda609f47 100644
--- a/tests/acceptance/17_packages/11_old/unsafe/timed/inventory_packages_update_frequency.cf
+++ b/tests/acceptance/17_packages/11_old/unsafe/timed/inventory_packages_update_frequency.cf
@@ -3,7 +3,7 @@
 
 body common control
 {
-    inputs => { "../../../../dcs.cf.sub",
+    inputs => { "../../../../dcs.sub.cf",
                 "../../../../../../inventory/any.cf",
                 "../../../../../../$(sys.local_libdir)/stdlib.cf",
                 "../../../../../../$(sys.local_libdir)/packages.cf"
diff --git a/tests/acceptance/17_packages/12_new/timed/installed-list-cached.cf b/tests/acceptance/17_packages/12_new/timed/installed-list-cached.cf
index 2c4b89e3e0..f9ace0daff 100644
--- a/tests/acceptance/17_packages/12_new/timed/installed-list-cached.cf
+++ b/tests/acceptance/17_packages/12_new/timed/installed-list-cached.cf
@@ -2,7 +2,7 @@
 
 body common control
 {
-    inputs => { "../../../default.cf.sub" };
+    inputs => { "../../../default.sub.cf" };
     bundlesequence => { default($(this.promise_filename)) };
 }
 
diff --git a/tests/acceptance/17_packages/12_new/timed/installed-list-cached.cf.sub b/tests/acceptance/17_packages/12_new/timed/installed-list-cached.cf.sub
index 212e5bf97b..4776c35e4b 100644
--- a/tests/acceptance/17_packages/12_new/timed/installed-list-cached.cf.sub
+++ b/tests/acceptance/17_packages/12_new/timed/installed-list-cached.cf.sub
@@ -2,7 +2,7 @@
 
 body common control
 {
-    inputs => { "../../../default.cf.sub" };
+    inputs => { "../../../default.sub.cf" };
     bundlesequence => { default($(this.promise_filename)) };
 
     package_module => "test_module";
diff --git a/tests/acceptance/17_packages/12_new/timed/local-updates-list-cached.cf b/tests/acceptance/17_packages/12_new/timed/local-updates-list-cached.cf
index 0d21e3421e..d882d35815 100644
--- a/tests/acceptance/17_packages/12_new/timed/local-updates-list-cached.cf
+++ b/tests/acceptance/17_packages/12_new/timed/local-updates-list-cached.cf
@@ -3,7 +3,7 @@
 
 body common control
 {
-    inputs => { "../../../default.cf.sub" };
+    inputs => { "../../../default.sub.cf" };
     bundlesequence => { default($(this.promise_filename)) };
 }
 
diff --git a/tests/acceptance/17_packages/12_new/timed/local-updates-list-cached.cf.sub b/tests/acceptance/17_packages/12_new/timed/local-updates-list-cached.cf.sub
index e680074f53..f1542993f9 100644
--- a/tests/acceptance/17_packages/12_new/timed/local-updates-list-cached.cf.sub
+++ b/tests/acceptance/17_packages/12_new/timed/local-updates-list-cached.cf.sub
@@ -3,7 +3,7 @@
 
 body common control
 {
-    inputs => { "../../../default.cf.sub" };
+    inputs => { "../../../default.sub.cf" };
     bundlesequence => { default($(this.promise_filename)) };
 
     package_module => "test_module";
diff --git a/tests/acceptance/17_packages/12_new/timed/packagesmatching.cf b/tests/acceptance/17_packages/12_new/timed/packagesmatching.cf
index b91889c450..3bb5762d52 100644
--- a/tests/acceptance/17_packages/12_new/timed/packagesmatching.cf
+++ b/tests/acceptance/17_packages/12_new/timed/packagesmatching.cf
@@ -2,7 +2,7 @@
 
 body common control
 {
-    inputs => { "../../../default.cf.sub" };
+    inputs => { "../../../default.sub.cf" };
     bundlesequence => { default($(this.promise_filename)) };
 
     package_inventory => { test_module };
@@ -84,4 +84,3 @@ bundle agent check
     test_pass_3.!ok_pass3::
       "$(this.promise_filename) FAIL";
 }
-
diff --git a/tests/acceptance/17_packages/12_new/timed/updates-list-cached.cf b/tests/acceptance/17_packages/12_new/timed/updates-list-cached.cf
index 91010dceae..ae34ee81bf 100644
--- a/tests/acceptance/17_packages/12_new/timed/updates-list-cached.cf
+++ b/tests/acceptance/17_packages/12_new/timed/updates-list-cached.cf
@@ -2,7 +2,7 @@
 
 body common control
 {
-    inputs => { "../../../default.cf.sub" };
+    inputs => { "../../../default.sub.cf" };
     bundlesequence => { default($(this.promise_filename)) };
 }
 
diff --git a/tests/acceptance/17_packages/12_new/timed/updates-list-cached.cf.sub b/tests/acceptance/17_packages/12_new/timed/updates-list-cached.cf.sub
index ff86412af9..49fefc32f3 100644
--- a/tests/acceptance/17_packages/12_new/timed/updates-list-cached.cf.sub
+++ b/tests/acceptance/17_packages/12_new/timed/updates-list-cached.cf.sub
@@ -2,7 +2,7 @@
 
 body common control
 {
-    inputs => { "../../../default.cf.sub" };
+    inputs => { "../../../default.sub.cf" };
     bundlesequence => { default($(this.promise_filename)) };
 
     package_module => "test_module";
diff --git a/tests/acceptance/17_packages/multiline_yum_check_update.cf b/tests/acceptance/17_packages/multiline_yum_check_update.cf
index f5cb0ac6cd..20c00022c5 100644
--- a/tests/acceptance/17_packages/multiline_yum_check_update.cf
+++ b/tests/acceptance/17_packages/multiline_yum_check_update.cf
@@ -5,13 +5,13 @@ body common control
 {
     cfengine_3_7::
       inputs => {
-                  "../dcs.cf.sub",
+                  "../dcs.sub.cf",
                   "../../../lib/stdlib.cf",
                   "../../../lib/packages.cf",
                 };
 
     !cfengine_3_7::
-      inputs => { "../dcs.cf.sub",
+      inputs => { "../dcs.sub.cf",
                   "../../../$(sys.local_libdir)/stdlib.cf",
                   "../../../$(sys.local_libdir)/packages.cf",
       };
diff --git a/tests/acceptance/30_custom_promise_types/05_cp_using_library.cf b/tests/acceptance/30_custom_promise_types/05_cp_using_library.cf
index ab28397a8d..c10346cdb3 100644
--- a/tests/acceptance/30_custom_promise_types/05_cp_using_library.cf
+++ b/tests/acceptance/30_custom_promise_types/05_cp_using_library.cf
@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-    inputs => { "../default.cf.sub" };
+    inputs => { "../default.sub.cf" };
     bundlesequence  => { default("$(this.promise_filename)") };
     version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/06_cp_with_classes.cf b/tests/acceptance/30_custom_promise_types/06_cp_with_classes.cf
index 0b79d4fae9..61f03ee7f1 100644
--- a/tests/acceptance/30_custom_promise_types/06_cp_with_classes.cf
+++ b/tests/acceptance/30_custom_promise_types/06_cp_with_classes.cf
@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-    inputs => { "../default.cf.sub" };
+    inputs => { "../default.sub.cf" };
     bundlesequence  => { default("$(this.promise_filename)") };
     version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/07_python_library.cf b/tests/acceptance/30_custom_promise_types/07_python_library.cf
index b6c978d254..12e63a6747 100644
--- a/tests/acceptance/30_custom_promise_types/07_python_library.cf
+++ b/tests/acceptance/30_custom_promise_types/07_python_library.cf
@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-    inputs => { "../default.cf.sub" };
+    inputs => { "../default.sub.cf" };
     bundlesequence  => { default("$(this.promise_filename)") };
     version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/08_slist_attrs.cf b/tests/acceptance/30_custom_promise_types/08_slist_attrs.cf
index 7eb6fde06f..c86770676f 100644
--- a/tests/acceptance/30_custom_promise_types/08_slist_attrs.cf
+++ b/tests/acceptance/30_custom_promise_types/08_slist_attrs.cf
@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-        inputs => { "../default.cf.sub" };
+        inputs => { "../default.sub.cf" };
         bundlesequence  => { default("$(this.promise_filename)") };
         version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/09_log_level.cf b/tests/acceptance/30_custom_promise_types/09_log_level.cf
index 92e7f4bc08..bc0b9f9496 100644
--- a/tests/acceptance/30_custom_promise_types/09_log_level.cf
+++ b/tests/acceptance/30_custom_promise_types/09_log_level.cf
@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-    inputs => { "../default.cf.sub" };
+    inputs => { "../default.sub.cf" };
     bundlesequence  => { default("$(this.promise_filename)") };
     version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/09_log_level.cf.sub b/tests/acceptance/30_custom_promise_types/09_log_level.cf.sub
index 7e4a6e6515..d431415794 100644
--- a/tests/acceptance/30_custom_promise_types/09_log_level.cf.sub
+++ b/tests/acceptance/30_custom_promise_types/09_log_level.cf.sub
@@ -1,6 +1,6 @@
 body common control
 {
-    inputs => { "../default.cf.sub" };
+    inputs => { "../default.sub.cf" };
     bundlesequence  => { default("$(this.promise_filename)") };
     version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/10_log_level_bad_module.cf b/tests/acceptance/30_custom_promise_types/10_log_level_bad_module.cf
index 92e7f4bc08..bc0b9f9496 100644
--- a/tests/acceptance/30_custom_promise_types/10_log_level_bad_module.cf
+++ b/tests/acceptance/30_custom_promise_types/10_log_level_bad_module.cf
@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-    inputs => { "../default.cf.sub" };
+    inputs => { "../default.sub.cf" };
     bundlesequence  => { default("$(this.promise_filename)") };
     version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/10_log_level_bad_module.cf.sub b/tests/acceptance/30_custom_promise_types/10_log_level_bad_module.cf.sub
index 8c6e560a70..47b7635a72 100644
--- a/tests/acceptance/30_custom_promise_types/10_log_level_bad_module.cf.sub
+++ b/tests/acceptance/30_custom_promise_types/10_log_level_bad_module.cf.sub
@@ -1,6 +1,6 @@
 body common control
 {
-    inputs => { "../default.cf.sub" };
+    inputs => { "../default.sub.cf" };
     bundlesequence  => { default("$(this.promise_filename)") };
     version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/11_handle.cf b/tests/acceptance/30_custom_promise_types/11_handle.cf
index 53ecad4d7d..81aba4f0df 100644
--- a/tests/acceptance/30_custom_promise_types/11_handle.cf
+++ b/tests/acceptance/30_custom_promise_types/11_handle.cf
@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-        inputs => { "../default.cf.sub" };
+        inputs => { "../default.sub.cf" };
         bundlesequence  => { default("$(this.promise_filename)") };
         version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/16_data_attrs.cf b/tests/acceptance/30_custom_promise_types/16_data_attrs.cf
index 4f47c83f0d..23e8fcb11b 100644
--- a/tests/acceptance/30_custom_promise_types/16_data_attrs.cf
+++ b/tests/acceptance/30_custom_promise_types/16_data_attrs.cf
@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-        inputs => { "../default.cf.sub" };
+        inputs => { "../default.sub.cf" };
         bundlesequence  => { default("$(this.promise_filename)") };
         version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/19_different_promise_types.cf b/tests/acceptance/30_custom_promise_types/19_different_promise_types.cf
index cd4ffe5cc4..b8b5873d73 100644
--- a/tests/acceptance/30_custom_promise_types/19_different_promise_types.cf
+++ b/tests/acceptance/30_custom_promise_types/19_different_promise_types.cf
@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-    inputs => { "../default.cf.sub" };
+    inputs => { "../default.sub.cf" };
     bundlesequence  => { default("$(this.promise_filename)") };
     version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/20_depends_on.cf b/tests/acceptance/30_custom_promise_types/20_depends_on.cf
index 8443e167d6..359a858f1f 100644
--- a/tests/acceptance/30_custom_promise_types/20_depends_on.cf
+++ b/tests/acceptance/30_custom_promise_types/20_depends_on.cf
@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-    inputs => { "../default.cf.sub" };
+    inputs => { "../default.sub.cf" };
     bundlesequence  => { default("$(this.promise_filename)") };
     version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/21_with_attribute.cf b/tests/acceptance/30_custom_promise_types/21_with_attribute.cf
index 40b1b3c7ae..0f8d165c0d 100644
--- a/tests/acceptance/30_custom_promise_types/21_with_attribute.cf
+++ b/tests/acceptance/30_custom_promise_types/21_with_attribute.cf
@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-    inputs => { "../default.cf.sub" };
+    inputs => { "../default.sub.cf" };
     bundlesequence  => { default("$(this.promise_filename)") };
     version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/22_bodies.cf b/tests/acceptance/30_custom_promise_types/22_bodies.cf
index 9aba71e11a..8b30c0fa38 100644
--- a/tests/acceptance/30_custom_promise_types/22_bodies.cf
+++ b/tests/acceptance/30_custom_promise_types/22_bodies.cf
@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-    inputs => { "../default.cf.sub" };
+    inputs => { "../default.sub.cf" };
     bundlesequence  => { default("$(this.promise_filename)") };
     version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/22_single_evaluation.cf b/tests/acceptance/30_custom_promise_types/22_single_evaluation.cf
index 7a0011ef4e..3fe12da6c7 100644
--- a/tests/acceptance/30_custom_promise_types/22_single_evaluation.cf
+++ b/tests/acceptance/30_custom_promise_types/22_single_evaluation.cf
@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-    inputs => { "../default.cf.sub" };
+    inputs => { "../default.sub.cf" };
     bundlesequence  => { default("$(this.promise_filename)") };
     version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/23_comment.cf b/tests/acceptance/30_custom_promise_types/23_comment.cf
index 756e24b6ef..af570ad091 100755
--- a/tests/acceptance/30_custom_promise_types/23_comment.cf
+++ b/tests/acceptance/30_custom_promise_types/23_comment.cf
@@ -6,7 +6,7 @@
 
 body common control
 {
-  inputs => { "../default.cf.sub" };
+  inputs => { "../default.sub.cf" };
   bundlesequence  => { default("$(this.promise_filename)") };
   version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/24_expireafter.cf b/tests/acceptance/30_custom_promise_types/24_expireafter.cf
index 1a2886845e..e1df835da4 100644
--- a/tests/acceptance/30_custom_promise_types/24_expireafter.cf
+++ b/tests/acceptance/30_custom_promise_types/24_expireafter.cf
@@ -6,7 +6,7 @@
 
 body common control
 {
-  inputs => { "../default.cf.sub" };
+  inputs => { "../default.sub.cf" };
   bundlesequence  => { default("$(this.promise_filename)") };
   version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/24_expireafter.cf.sub b/tests/acceptance/30_custom_promise_types/24_expireafter.cf.sub
index e23bbbdbd2..5d7ee8b98e 100644
--- a/tests/acceptance/30_custom_promise_types/24_expireafter.cf.sub
+++ b/tests/acceptance/30_custom_promise_types/24_expireafter.cf.sub
@@ -6,7 +6,7 @@
 
 body common control
 {
-  inputs => { "../default.cf.sub" };
+  inputs => { "../default.sub.cf" };
   bundlesequence  => { "test" };
   version => "1.0";
 }
diff --git a/tests/acceptance/30_custom_promise_types/25_top_down_evaluation_custom_promise_types.cf b/tests/acceptance/30_custom_promise_types/25_top_down_evaluation_custom_promise_types.cf
index 10aea0b755..5b0feb8968 100644
--- a/tests/acceptance/30_custom_promise_types/25_top_down_evaluation_custom_promise_types.cf
+++ b/tests/acceptance/30_custom_promise_types/25_top_down_evaluation_custom_promise_types.cf
@@ -1,6 +1,6 @@
 body common control
 {
-  inputs => { "../default.cf.sub" };
+  inputs => { "../default.sub.cf" };
   bundlesequence => { "test", "cleanup" };
   evaluation_order => "top_down";
 }
diff --git a/tests/acceptance/Makefile.am b/tests/acceptance/Makefile.am
index 1606bc3831..577aaf6862 100644
--- a/tests/acceptance/Makefile.am
+++ b/tests/acceptance/Makefile.am
@@ -1,7 +1,6 @@
 ENV_FILE=testall.env
 
 copy:
-	cp $(core_dir)/tests/acceptance/*.cf.sub .
 	cp $(core_dir)/tests/acceptance/*.sub.cf .
 
 env:
@@ -23,7 +22,7 @@ check-local: create-env
 
 CLEANFILES  = testall.env summary.log test.log test.xml Makefile.testall
 #These are created by running the submakefile
-CLEANFILES += dcs.cf.sub default.cf.sub plucked.sub.cf
+CLEANFILES += dcs.sub.cf default.sub.cf plucked.sub.cf
 
 
 EXTRA_DIST  = README.md
diff --git a/tests/acceptance/README.org b/tests/acceptance/README.org
index 6d15ad35ca..6168380e60 100644
--- a/tests/acceptance/README.org
+++ b/tests/acceptance/README.org
@@ -12,7 +12,7 @@ stdlib directly, but does not include the rest of the test framework.
 
 ** Example test
 
-This is the main test. Note how it includes =default.cf.sub= and runs the
+This is the main test. Note how it includes =default.sub.cf= and runs the
 typical test bundlesequence. The test passes based on the *OUTPUT* of the
 subtest which runs from a policy file with the same name suffixed with =.sub=.
 
@@ -20,7 +20,7 @@ subtest which runs from a policy file with the same name suffixed with =.sub=.
 #+BEGIN_SRC cfengine3
 body common control
 {
-        inputs => { '../../default.cf.sub' };
+        inputs => { '../../default.sub.cf' };
         bundlesequence  => { default("$(this.promise_filename)") };
         version => "1.0";
 }
@@ -55,7 +55,7 @@ R: line 9";
 #+END_SRC
 
 This is the subtest itself. Note how it *does not include the test framework*
-(=default.cf.sub=) but instead includes the part of the standard library that it
+(=default.sub.cf=) but instead includes the part of the standard library that it
 needs for the test. In this case the subtest outputs information that the main
 test inspects for pass or failure. The main test could also inspect data in
 other files. Consider writing a data file containing the =datastate()= or
diff --git a/tests/acceptance/lib/bundles/run_ifdefined.cf b/tests/acceptance/lib/bundles/run_ifdefined.cf
index 5a88a1c8cb..1fc343441f 100644
--- a/tests/acceptance/lib/bundles/run_ifdefined.cf
+++ b/tests/acceptance/lib/bundles/run_ifdefined.cf
@@ -6,7 +6,7 @@
 
 body common control
 {
-      inputs => { '../../default.cf.sub' };
+      inputs => { '../../default.sub.cf' };
       bundlesequence  => { default("$(this.promise_filename)") };
 }
 
diff --git a/tests/acceptance/lib/common/always.cf b/tests/acceptance/lib/common/always.cf
index 9dd67e958d..b2e7b35f70 100644
--- a/tests/acceptance/lib/common/always.cf
+++ b/tests/acceptance/lib/common/always.cf
@@ -6,7 +6,7 @@
 
 body common control
 {
-      inputs => { '../../default.cf.sub' };
+      inputs => { '../../default.sub.cf' };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
diff --git a/tests/acceptance/lib/files/CFE-1710.cf b/tests/acceptance/lib/files/CFE-1710.cf
index 5b15e113b0..10af749f83 100644
--- a/tests/acceptance/lib/files/CFE-1710.cf
+++ b/tests/acceptance/lib/files/CFE-1710.cf
@@ -1,6 +1,6 @@
 body common control
 {
-      inputs => { '../../default.cf.sub' };
+      inputs => { '../../default.sub.cf' };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
diff --git a/tests/acceptance/lib/files/append_user_field.cf b/tests/acceptance/lib/files/append_user_field.cf
index 18a556541e..eadf7631fa 100644
--- a/tests/acceptance/lib/files/append_user_field.cf
+++ b/tests/acceptance/lib/files/append_user_field.cf
@@ -1,6 +1,6 @@
 body common control
 {
-      inputs => { '../../default.cf.sub' };
+      inputs => { '../../default.sub.cf' };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
diff --git a/tests/acceptance/lib/files/edit_line_converge.cf b/tests/acceptance/lib/files/edit_line_converge.cf
index 27078bd283..3b4b3db75a 100644
--- a/tests/acceptance/lib/files/edit_line_converge.cf
+++ b/tests/acceptance/lib/files/edit_line_converge.cf
@@ -1,6 +1,6 @@
 body common control
 {
-      inputs => { '../../default.cf.sub' };
+      inputs => { '../../default.sub.cf' };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
@@ -11,7 +11,7 @@ bundle common classes
   classes:
       "testing_masterfiles_policy_framework"
         scope => "namespace",
-        comment => "This class is needed so that dcs.cf.sub includes the stdlib instead of using plucked.sub.cf from core which might get out of date and cause us to not test current code from the MPF.";
+        comment => "This class is needed so that dcs.sub.cf includes the stdlib instead of using plucked.sub.cf from core which might get out of date and cause us to not test current code from the MPF.";
 }
 bundle agent init
 {
diff --git a/tests/acceptance/lib/files/edit_line_converge_prepend.cf b/tests/acceptance/lib/files/edit_line_converge_prepend.cf
index 72bbcf5cc4..0eab824005 100644
--- a/tests/acceptance/lib/files/edit_line_converge_prepend.cf
+++ b/tests/acceptance/lib/files/edit_line_converge_prepend.cf
@@ -1,6 +1,6 @@
 body common control
 {
-      inputs => { '../../default.cf.sub' };
+      inputs => { '../../default.sub.cf' };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
@@ -12,7 +12,7 @@ bundle common classes
 
       "testing_masterfiles_policy_framework"
         scope => "namespace",
-        comment => "This class is needed so that dcs.cf.sub includes the stdlib instead of using plucked.sub.cf from core which might get out of date and cause us to not test current code from the MPF.";
+        comment => "This class is needed so that dcs.sub.cf includes the stdlib instead of using plucked.sub.cf from core which might get out of date and cause us to not test current code from the MPF.";
 }
 
 bundle agent init
diff --git a/tests/acceptance/lib/files/insert_ini_section.cf b/tests/acceptance/lib/files/insert_ini_section.cf
index 8917687bc9..b3b829253c 100644
--- a/tests/acceptance/lib/files/insert_ini_section.cf
+++ b/tests/acceptance/lib/files/insert_ini_section.cf
@@ -6,7 +6,7 @@
 
 body common control
 {
-      inputs => { '../../default.cf.sub' };
+      inputs => { '../../default.sub.cf' };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
diff --git a/tests/acceptance/lib/files/manage_variable_values_ini.cf b/tests/acceptance/lib/files/manage_variable_values_ini.cf
index 15111f5e6a..c4b3b76ddd 100644
--- a/tests/acceptance/lib/files/manage_variable_values_ini.cf
+++ b/tests/acceptance/lib/files/manage_variable_values_ini.cf
@@ -6,7 +6,7 @@
 
 body common control
 {
-      inputs => { '../../default.cf.sub' };
+      inputs => { '../../default.sub.cf' };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
diff --git a/tests/acceptance/lib/files/manage_variable_values_ini_metachar.cf b/tests/acceptance/lib/files/manage_variable_values_ini_metachar.cf
index 61de436e01..ea946ff371 100644
--- a/tests/acceptance/lib/files/manage_variable_values_ini_metachar.cf
+++ b/tests/acceptance/lib/files/manage_variable_values_ini_metachar.cf
@@ -6,7 +6,7 @@
 
 body common control
 {
-      inputs => { '../../default.cf.sub' };
+      inputs => { '../../default.sub.cf' };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
diff --git a/tests/acceptance/lib/files/replace_uncommented_substrings.cf b/tests/acceptance/lib/files/replace_uncommented_substrings.cf
index ad3e501058..63fcc592c7 100644
--- a/tests/acceptance/lib/files/replace_uncommented_substrings.cf
+++ b/tests/acceptance/lib/files/replace_uncommented_substrings.cf
@@ -1,6 +1,6 @@
 body common control
 {
-        inputs => { '../../default.cf.sub',
+        inputs => { '../../default.sub.cf',
         };
         bundlesequence  => { default("$(this.promise_filename)") };
         version => "1.0";
@@ -12,7 +12,7 @@ bundle common classes
   classes:
 
       "testing_masterfiles_policy_framework"
-        comment => "This class is needed so that dcs.cf.sub includes the stdlib instead of using plucked.sub.cf from core which might get out of date and cause us to not test current code from the MPF.";
+        comment => "This class is needed so that dcs.sub.cf includes the stdlib instead of using plucked.sub.cf from core which might get out of date and cause us to not test current code from the MPF.";
 }
 
 bundle agent test
diff --git a/tests/acceptance/lib/files/set_config_values.cf b/tests/acceptance/lib/files/set_config_values.cf
index a3a7d372c5..e4671d75a1 100644
--- a/tests/acceptance/lib/files/set_config_values.cf
+++ b/tests/acceptance/lib/files/set_config_values.cf
@@ -6,7 +6,7 @@
 
 body common control
 {
-      inputs => { '../../default.cf.sub' };
+      inputs => { '../../default.sub.cf' };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
diff --git a/tests/acceptance/lib/files/set_line_based-ENT-5866.cf b/tests/acceptance/lib/files/set_line_based-ENT-5866.cf
index 565af9691c..3ee2b3cdcf 100644
--- a/tests/acceptance/lib/files/set_line_based-ENT-5866.cf
+++ b/tests/acceptance/lib/files/set_line_based-ENT-5866.cf
@@ -6,7 +6,7 @@
 
 body common control
 {
-      inputs => { '../../default.cf.sub' };
+      inputs => { '../../default.sub.cf' };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
diff --git a/tests/acceptance/lib/files/set_line_based_config_values.cf b/tests/acceptance/lib/files/set_line_based_config_values.cf
index 2b4e4728a8..4ca2071b62 100644
--- a/tests/acceptance/lib/files/set_line_based_config_values.cf
+++ b/tests/acceptance/lib/files/set_line_based_config_values.cf
@@ -6,7 +6,7 @@
 
 body common control
 {
-      inputs => { '../../default.cf.sub' };
+      inputs => { '../../default.sub.cf' };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
diff --git a/tests/acceptance/lib/files/set_line_based_variable_values.cf b/tests/acceptance/lib/files/set_line_based_variable_values.cf
index fa2db933cb..86f987e5a5 100644
--- a/tests/acceptance/lib/files/set_line_based_variable_values.cf
+++ b/tests/acceptance/lib/files/set_line_based_variable_values.cf
@@ -6,7 +6,7 @@
 
 body common control
 {
-      inputs => { '../../default.cf.sub' };
+      inputs => { '../../default.sub.cf' };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
diff --git a/tests/acceptance/lib/files/set_variable_values.cf b/tests/acceptance/lib/files/set_variable_values.cf
index 757e0d2337..7047f7d622 100644
--- a/tests/acceptance/lib/files/set_variable_values.cf
+++ b/tests/acceptance/lib/files/set_variable_values.cf
@@ -6,7 +6,7 @@
 
 body common control
 {
-      inputs => { '../../default.cf.sub' };
+      inputs => { '../../default.sub.cf' };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
diff --git a/tests/acceptance/lib/files/set_variable_values_ini.cf b/tests/acceptance/lib/files/set_variable_values_ini.cf
index 41707edf9b..e0e9e326bd 100644
--- a/tests/acceptance/lib/files/set_variable_values_ini.cf
+++ b/tests/acceptance/lib/files/set_variable_values_ini.cf
@@ -6,7 +6,7 @@
 
 body common control
 {
-      inputs => { '../../default.cf.sub' };
+      inputs => { '../../default.sub.cf' };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
diff --git a/tests/acceptance/lib/files/set_variable_values_ini_missing_section.cf b/tests/acceptance/lib/files/set_variable_values_ini_missing_section.cf
index 6671d8af72..a2585b9d0a 100644
--- a/tests/acceptance/lib/files/set_variable_values_ini_missing_section.cf
+++ b/tests/acceptance/lib/files/set_variable_values_ini_missing_section.cf
@@ -6,7 +6,7 @@
 
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
diff --git a/tests/acceptance/lib/reports/cat.cf b/tests/acceptance/lib/reports/cat.cf
index 5baccb08d9..04a6830782 100644
--- a/tests/acceptance/lib/reports/cat.cf
+++ b/tests/acceptance/lib/reports/cat.cf
@@ -1,6 +1,6 @@
 body common control
 {
-        inputs => { '../../default.cf.sub' };
+        inputs => { '../../default.sub.cf' };
         bundlesequence  => { default("$(this.promise_filename)") };
         version => "1.0";
 }
diff --git a/tests/acceptance/lib/reports/head.cf b/tests/acceptance/lib/reports/head.cf
index 3833106460..8b5f4592e5 100644
--- a/tests/acceptance/lib/reports/head.cf
+++ b/tests/acceptance/lib/reports/head.cf
@@ -1,6 +1,6 @@
 body common control
 {
-        inputs => { '../../default.cf.sub' };
+        inputs => { '../../default.sub.cf' };
         bundlesequence  => { default("$(this.promise_filename)") };
         version => "1.0";
 }
diff --git a/tests/acceptance/lib/reports/head_n.cf b/tests/acceptance/lib/reports/head_n.cf
index fc016e1a0c..bd291bdd75 100644
--- a/tests/acceptance/lib/reports/head_n.cf
+++ b/tests/acceptance/lib/reports/head_n.cf
@@ -1,6 +1,6 @@
 body common control
 {
-        inputs => { '../../default.cf.sub' };
+        inputs => { '../../default.sub.cf' };
         bundlesequence  => { default("$(this.promise_filename)") };
         version => "1.0";
 }
diff --git a/tests/acceptance/lib/reports/tail.cf b/tests/acceptance/lib/reports/tail.cf
index 1809808c34..6321541959 100644
--- a/tests/acceptance/lib/reports/tail.cf
+++ b/tests/acceptance/lib/reports/tail.cf
@@ -1,6 +1,6 @@
 body common control
 {
-        inputs => { '../../default.cf.sub' };
+        inputs => { '../../default.sub.cf' };
         bundlesequence  => { default("$(this.promise_filename)") };
         version => "1.0";
 }
diff --git a/tests/acceptance/lib/reports/tail_n.cf b/tests/acceptance/lib/reports/tail_n.cf
index 4c819716e8..186082e852 100644
--- a/tests/acceptance/lib/reports/tail_n.cf
+++ b/tests/acceptance/lib/reports/tail_n.cf
@@ -1,6 +1,6 @@
 body common control
 {
-        inputs => { '../../default.cf.sub' };
+        inputs => { '../../default.sub.cf' };
         bundlesequence  => { default("$(this.promise_filename)") };
         version => "1.0";
 }
diff --git a/tests/acceptance/promises/autorun-D.cf b/tests/acceptance/promises/autorun-D.cf
index c207c3d9d9..1e2a685d02 100644
--- a/tests/acceptance/promises/autorun-D.cf
+++ b/tests/acceptance/promises/autorun-D.cf
@@ -5,7 +5,7 @@
 #######################################################
 body common control
 {
-  inputs => { '../default.cf.sub' };
+  inputs => { '../default.sub.cf' };
   bundlesequence => { default("$(this.promise_filename)") };
   version => "1.0";
 }
diff --git a/tests/acceptance/promises/autorun-def_json.cf b/tests/acceptance/promises/autorun-def_json.cf
index 90afc216cf..fb1932a119 100644
--- a/tests/acceptance/promises/autorun-def_json.cf
+++ b/tests/acceptance/promises/autorun-def_json.cf
@@ -5,7 +5,7 @@
 #######################################################
 body common control
 {
-  inputs => { '../default.cf.sub' };
+  inputs => { '../default.sub.cf' };
   bundlesequence => { default("$(this.promise_filename)") };
   version => "1.0";
 }
diff --git a/tests/acceptance/promises/autorun.cf b/tests/acceptance/promises/autorun.cf
index 4c05a9e619..911e0da7ad 100644
--- a/tests/acceptance/promises/autorun.cf
+++ b/tests/acceptance/promises/autorun.cf
@@ -5,7 +5,7 @@
 #######################################################
 body common control
 {
-  inputs => { '../default.cf.sub' };
+  inputs => { '../default.sub.cf' };
   bundlesequence => { default("$(this.promise_filename)") };
   version => "1.0";
 }
diff --git a/tests/acceptance/promises/promises.cf b/tests/acceptance/promises/promises.cf
index 60b79aca09..7b61d0fec0 100644
--- a/tests/acceptance/promises/promises.cf
+++ b/tests/acceptance/promises/promises.cf
@@ -5,7 +5,7 @@
 #######################################################
 body common control
 {
-  inputs => { '../default.cf.sub' };
+  inputs => { '../default.sub.cf' };
   bundlesequence => { default("$(this.promise_filename)") };
   version => "1.0";
 }