diff --git a/CODEOWNERS b/CODEOWNERS
index 591de224..f0221bfb 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -18,7 +18,7 @@
 /*/_mapdata/                                @saltstack-formulas/ssf
 /*/libsaltcli.jinja                         @saltstack-formulas/ssf
 /*/libtofs.jinja                            @saltstack-formulas/ssf
-/test/integration/**/_mapdata_spec.rb       @saltstack-formulas/ssf
+/test/integration/**/_mapdata.rb            @saltstack-formulas/ssf
 /test/integration/**/libraries/system.rb    @saltstack-formulas/ssf
 /test/integration/**/inspec.yml             @saltstack-formulas/ssf
 /test/integration/**/README.md              @saltstack-formulas/ssf
diff --git a/test/integration/default/controls/_mapdata_spec.rb b/test/integration/default/controls/_mapdata.rb
similarity index 96%
rename from test/integration/default/controls/_mapdata_spec.rb
rename to test/integration/default/controls/_mapdata.rb
index 64635323..6698ba61 100644
--- a/test/integration/default/controls/_mapdata_spec.rb
+++ b/test/integration/default/controls/_mapdata.rb
@@ -2,8 +2,8 @@
 
 require 'yaml'
 
-control '`map.jinja` YAML dump' do
-  title 'should match the comparison file'
+control 'TEMPLATE._mapdata' do
+  title '`map.jinja` should match the reference file'
 
   ### Method
   # The steps below for each file appear convoluted but they are both required
diff --git a/test/integration/default/controls/config_spec.rb b/test/integration/default/controls/config.rb
similarity index 95%
rename from test/integration/default/controls/config_spec.rb
rename to test/integration/default/controls/config.rb
index 5e81feee..d501ee3a 100644
--- a/test/integration/default/controls/config_spec.rb
+++ b/test/integration/default/controls/config.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-control 'TEMPLATE configuration' do
-  title 'should match desired lines'
+control 'TEMPLATE.config.file' do
+  title 'Verify the configuration file'
 
   describe file('/etc/template-formula.conf') do
     it { should be_file }
diff --git a/test/integration/default/controls/packages_spec.rb b/test/integration/default/controls/packages.rb
similarity index 80%
rename from test/integration/default/controls/packages_spec.rb
rename to test/integration/default/controls/packages.rb
index 0f3ca8c2..9e68437e 100644
--- a/test/integration/default/controls/packages_spec.rb
+++ b/test/integration/default/controls/packages.rb
@@ -3,8 +3,8 @@
 # Prepare platform "finger"
 platform_finger = system.platform[:finger].split('.').first.to_s
 
-control 'TEMPLATE package' do
-  title 'should be installed'
+control 'TEMPLATE.package.install' do
+  title 'The required package should be installed'
 
   # Overide by `platform_finger`
   package_name =
diff --git a/test/integration/default/controls/services_spec.rb b/test/integration/default/controls/services.rb
similarity index 80%
rename from test/integration/default/controls/services_spec.rb
rename to test/integration/default/controls/services.rb
index 4fd616ff..44fcab1b 100644
--- a/test/integration/default/controls/services_spec.rb
+++ b/test/integration/default/controls/services.rb
@@ -3,9 +3,8 @@
 # Prepare platform "finger"
 platform_finger = system.platform[:finger].split('.').first.to_s
 
-control 'TEMPLATE service' do
-  impact 0.5
-  title 'should be running and enabled'
+control 'TEMPLATE.service.running' do
+  title 'The service should be installed, enabled and running'
 
   # Overide by `platform_finger`
   service_name =
diff --git a/test/integration/default/controls/subcomponent_config_spec.rb b/test/integration/default/controls/subcomponent_config.rb
similarity index 85%
rename from test/integration/default/controls/subcomponent_config_spec.rb
rename to test/integration/default/controls/subcomponent_config.rb
index f9c91080..5501f924 100644
--- a/test/integration/default/controls/subcomponent_config_spec.rb
+++ b/test/integration/default/controls/subcomponent_config.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-control 'TEMPLATE subcomponent configuration' do
-  title 'should match desired lines'
+control 'TEMPLATE.subcomponent.config.file' do
+  title 'Verify the subcomponent configuration file'
 
   describe file('/etc/TEMPLATE-subcomponent-formula.conf') do
     it { should be_file }