diff --git a/testimony.yaml b/testimony.yaml
index e6c210965a2..01769ceb0f3 100644
--- a/testimony.yaml
+++ b/testimony.yaml
@@ -25,8 +25,8 @@ CaseComponent:
     - Branding
     - BVT
     - Candlepin
-    - Capsule
-    - Capsule-Content
+    - ForemanProxy
+    - ForemanProxy-Content
     - Certificates
     - ComputeResources
     - ComputeResources-Azure
@@ -53,7 +53,7 @@ CaseComponent:
     - ErrataManagement
     - Fact
     - ForemanDebug
-    - ForemanMaintain
+    - SatelliteMaintain
     - Hammer
     - Hammer-Content
     - HTTPProxy
@@ -64,7 +64,7 @@ CaseComponent:
     - Hosts-Content
     - Infobloxintegration
     - Infrastructure
-    - Installer
+    - Installation
     - InterSatelliteSync
     - katello-tracer
     - LDAP
@@ -89,9 +89,7 @@ CaseComponent:
     - RemoteExecution
     - Reporting
     - Repositories
-    - RHCloud-CloudConnector
-    - RHCloud-Insights
-    - RHCloud-Inventory
+    - RHCloud
     - rubygem-foreman-redhat_access
     - satellite-change-hostname
     - SatelliteClone
diff --git a/tests/foreman/api/test_capsulecontent.py b/tests/foreman/api/test_capsulecontent.py
index abbfd9f9f32..3de2c2ef487 100644
--- a/tests/foreman/api/test_capsulecontent.py
+++ b/tests/foreman/api/test_capsulecontent.py
@@ -1,11 +1,11 @@
 """Content Management related tests, which exercise katello with pulp
 interactions and use capsule.
 
-:Requirement: Capsule-Content
+:Requirement: ForemanProxy-Content
 
 :CaseAutomation: Automated
 
-:CaseComponent: Capsule-Content
+:CaseComponent: ForemanProxy-Content
 
 :team: Phoenix-content
 
diff --git a/tests/foreman/api/test_rhc.py b/tests/foreman/api/test_rhc.py
index 521b1cb15da..30559fe406e 100644
--- a/tests/foreman/api/test_rhc.py
+++ b/tests/foreman/api/test_rhc.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: RHCloud-CloudConnector
+:CaseComponent: RHCloud
 
 :Team: Platform
 
diff --git a/tests/foreman/api/test_rhcloud_inventory.py b/tests/foreman/api/test_rhcloud_inventory.py
index 9cbd70dc2d4..6be4e14a596 100644
--- a/tests/foreman/api/test_rhcloud_inventory.py
+++ b/tests/foreman/api/test_rhcloud_inventory.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: RHCloud-Inventory
+:CaseComponent: RHCloud
 
 :Team: Platform
 
diff --git a/tests/foreman/cli/test_capsulecontent.py b/tests/foreman/cli/test_capsulecontent.py
index 73e42659fa2..ef13f0fd9fa 100644
--- a/tests/foreman/cli/test_capsulecontent.py
+++ b/tests/foreman/cli/test_capsulecontent.py
@@ -1,10 +1,10 @@
-"""Capsule-Content related tests being run through CLI.
+"""ForemanProxy-Content related tests being run through CLI.
 
-:Requirement: Capsule-Content
+:Requirement: ForemanProxy-Content
 
 :CaseAutomation: Automated
 
-:CaseComponent: Capsule-Content
+:CaseComponent: ForemanProxy-Content
 
 :team: Phoenix-content
 
diff --git a/tests/foreman/cli/test_rhcloud_inventory.py b/tests/foreman/cli/test_rhcloud_inventory.py
index e127f6e7382..e2dce34ffdc 100644
--- a/tests/foreman/cli/test_rhcloud_inventory.py
+++ b/tests/foreman/cli/test_rhcloud_inventory.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: RHCloud-Inventory
+:CaseComponent: RHCloud
 
 :Team: Platform
 
diff --git a/tests/foreman/destructive/test_capsulecontent.py b/tests/foreman/destructive/test_capsulecontent.py
index 12f3455c08d..7c09a780088 100644
--- a/tests/foreman/destructive/test_capsulecontent.py
+++ b/tests/foreman/destructive/test_capsulecontent.py
@@ -1,10 +1,10 @@
-"""Capsule-Content related tests, which require destructive Satellite
+"""ForemanProxy-Content related tests, which require destructive Satellite
 
-:Requirement: Capsule-Content
+:Requirement: ForemanProxy-Content
 
 :CaseAutomation: Automated
 
-:CaseComponent: Capsule-Content
+:CaseComponent: ForemanProxy-Content
 
 :team: Phoenix-content
 
diff --git a/tests/foreman/destructive/test_packages.py b/tests/foreman/destructive/test_packages.py
index e81eb228268..da9c15f6515 100644
--- a/tests/foreman/destructive/test_packages.py
+++ b/tests/foreman/destructive/test_packages.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: ForemanMaintain
+:CaseComponent: SatelliteMaintain
 
 :Team: Platform
 
diff --git a/tests/foreman/maintain/test_advanced.py b/tests/foreman/maintain/test_advanced.py
index 2771994d568..1167e907102 100644
--- a/tests/foreman/maintain/test_advanced.py
+++ b/tests/foreman/maintain/test_advanced.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: ForemanMaintain
+:CaseComponent: SatelliteMaintain
 
 :Team: Platform
 
diff --git a/tests/foreman/maintain/test_backup_restore.py b/tests/foreman/maintain/test_backup_restore.py
index a845e71a166..f81b268e844 100644
--- a/tests/foreman/maintain/test_backup_restore.py
+++ b/tests/foreman/maintain/test_backup_restore.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: ForemanMaintain
+:CaseComponent: SatelliteMaintain
 
 :Team: Platform
 
diff --git a/tests/foreman/maintain/test_health.py b/tests/foreman/maintain/test_health.py
index e927d85b5a5..9da62960142 100644
--- a/tests/foreman/maintain/test_health.py
+++ b/tests/foreman/maintain/test_health.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: ForemanMaintain
+:CaseComponent: SatelliteMaintain
 
 :Team: Platform
 
diff --git a/tests/foreman/maintain/test_maintenance_mode.py b/tests/foreman/maintain/test_maintenance_mode.py
index 3cc340f774b..50d130ac55a 100644
--- a/tests/foreman/maintain/test_maintenance_mode.py
+++ b/tests/foreman/maintain/test_maintenance_mode.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: ForemanMaintain
+:CaseComponent: SatelliteMaintain
 
 :Team: Platform
 
diff --git a/tests/foreman/maintain/test_offload_DB.py b/tests/foreman/maintain/test_offload_DB.py
index ca0f64f87d8..77ae9a1e1ac 100644
--- a/tests/foreman/maintain/test_offload_DB.py
+++ b/tests/foreman/maintain/test_offload_DB.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: ManualOnly
 
-:CaseComponent: ForemanMaintain
+:CaseComponent: SatelliteMaintain
 
 :Team: Platform
 
diff --git a/tests/foreman/maintain/test_packages.py b/tests/foreman/maintain/test_packages.py
index 9931d144352..a4c56eac531 100644
--- a/tests/foreman/maintain/test_packages.py
+++ b/tests/foreman/maintain/test_packages.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: ForemanMaintain
+:CaseComponent: SatelliteMaintain
 
 :Team: Platform
 
diff --git a/tests/foreman/maintain/test_service.py b/tests/foreman/maintain/test_service.py
index 802ca684bb2..7f8c0efad8c 100644
--- a/tests/foreman/maintain/test_service.py
+++ b/tests/foreman/maintain/test_service.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: ForemanMaintain
+:CaseComponent: SatelliteMaintain
 
 :Team: Platform
 
diff --git a/tests/foreman/maintain/test_upgrade.py b/tests/foreman/maintain/test_upgrade.py
index 13ea31a5de0..0f08f23c6b3 100644
--- a/tests/foreman/maintain/test_upgrade.py
+++ b/tests/foreman/maintain/test_upgrade.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: ForemanMaintain
+:CaseComponent: SatelliteMaintain
 
 :Team: Platform
 
diff --git a/tests/foreman/ui/test_capsulecontent.py b/tests/foreman/ui/test_capsulecontent.py
index f2e8db514e3..80b744e0bff 100644
--- a/tests/foreman/ui/test_capsulecontent.py
+++ b/tests/foreman/ui/test_capsulecontent.py
@@ -1,10 +1,10 @@
-"""Capsule-Content related tests being run through UI.
+"""ForemanProxy-Content related tests being run through UI.
 
-:Requirement: Capsule-Content
+:Requirement: ForemanProxy-Content
 
 :CaseAutomation: Automated
 
-:CaseComponent: Capsule-Content
+:CaseComponent: ForemanProxy-Content
 
 :team: Phoenix-content
 
diff --git a/tests/foreman/ui/test_rhc.py b/tests/foreman/ui/test_rhc.py
index 0fdefee5bf1..f3ab5eae14f 100644
--- a/tests/foreman/ui/test_rhc.py
+++ b/tests/foreman/ui/test_rhc.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: RHCloud-CloudConnector
+:CaseComponent: RHCloud
 
 :Team: Platform
 
diff --git a/tests/foreman/ui/test_rhcloud_insights.py b/tests/foreman/ui/test_rhcloud_insights.py
index 9dcd309055c..5c504e42e67 100644
--- a/tests/foreman/ui/test_rhcloud_insights.py
+++ b/tests/foreman/ui/test_rhcloud_insights.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: RHCloud-Inventory
+:CaseComponent: RHCloud
 
 :Team: Platform
 
diff --git a/tests/foreman/ui/test_rhcloud_inventory.py b/tests/foreman/ui/test_rhcloud_inventory.py
index e242366bf0a..220d66443d9 100644
--- a/tests/foreman/ui/test_rhcloud_inventory.py
+++ b/tests/foreman/ui/test_rhcloud_inventory.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: RHCloud-Inventory
+:CaseComponent: RHCloud
 
 :Team: Platform
 
diff --git a/tests/upgrades/test_performance_tuning.py b/tests/upgrades/test_performance_tuning.py
index 94e40a33ba7..33237e8f561 100644
--- a/tests/upgrades/test_performance_tuning.py
+++ b/tests/upgrades/test_performance_tuning.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: Installer
+:CaseComponent: Installation
 
 :Team: Platform
 
diff --git a/tests/upgrades/test_satellite_maintain.py b/tests/upgrades/test_satellite_maintain.py
index 5091f8508fd..8035416e39a 100644
--- a/tests/upgrades/test_satellite_maintain.py
+++ b/tests/upgrades/test_satellite_maintain.py
@@ -4,7 +4,7 @@
 
 :CaseAutomation: Automated
 
-:CaseComponent: ForemanMaintain
+:CaseComponent: SatelliteMaintain
 
 :Team: Platform