diff --git a/msvsphere-i686/general.conf b/msvsphere-i686/general.conf
index a0cf1fc..739f4b0 100644
--- a/msvsphere-i686/general.conf
+++ b/msvsphere-i686/general.conf
@@ -36,12 +36,12 @@ gather_backend = 'dnf'
 check_deps = False
 
 gather_method = {
-    # Anything that is not AppStream, CRB or Buildroot should use the old depsolver
-    "^(?!(AppStream|CRB|Buildroot)).*$": {
+    # Anything that is not AppStream, PowerTools or Buildroot should use the old depsolver
+    "^(?!(AppStream|PowerTools|Buildroot)).*$": {
         "comps": "deps",
         "json": "deps",
     },
-    "^(AppStream|CRB|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Testing)$": "hybrid",
+    "^(AppStream|PowerTools|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Testing)$": "hybrid",
 }
 
 hashed_directories = False
@@ -78,10 +78,10 @@ create_optional_isos = False
 #createiso_use_xorrisofs = True
 
 createiso_skip = [
-    ("^(BaseOS|AppStream|CRB|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Testing)$", {
+    ("^(BaseOS|AppStream|PowerTools|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Testing)$", {
         # No binary ISOs for BaseOS (but still generate src ISOs) - RCM-41330
         # No binary ISOs for AppStream (but still generate src ISOs) - RCM-40356
-        # No binary or src ISOs for CRB
+        # No binary or src ISOs for PowerTools
         # No binary or src ISOs for NFV
         # Note: "*" matches only binary architectures.
         "*": True,
@@ -129,8 +129,8 @@ lorax_options = [
 # LOOKASIDE
 variant_as_lookaside = [
     ('AppStream', 'BaseOS'),
-    ('CRB', 'BaseOS'),
-    ('CRB', 'AppStream'),
+    ('PowerTools', 'BaseOS'),
+    ('PowerTools', 'AppStream'),
     ('HighAvailability', 'BaseOS'),
     ('HighAvailability', 'AppStream'),
     ("ResilientStorage", "BaseOS"),
diff --git a/msvsphere/general.conf b/msvsphere/general.conf
index 6dc6bfa..b435686 100644
--- a/msvsphere/general.conf
+++ b/msvsphere/general.conf
@@ -36,12 +36,12 @@ gather_backend = 'dnf'
 check_deps = False
 
 gather_method = {
-    # Anything that is not AppStream, CRB or Buildroot should use the old depsolver
-    "^(?!(AppStream|CRB|Buildroot)).*$": {
+    # Anything that is not AppStream, PowerTools or Buildroot should use the old depsolver
+    "^(?!(AppStream|PowerTools|Buildroot)).*$": {
         "comps": "deps",
         "json": "deps",
     },
-    "^(AppStream|CRB|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Testing)$": "hybrid",
+    "^(AppStream|PowerTools|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Testing)$": "hybrid",
 }
 
 hashed_directories = False
@@ -78,10 +78,10 @@ create_optional_isos = False
 #createiso_use_xorrisofs = True
 
 createiso_skip = [
-    ("^(BaseOS|AppStream|CRB|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Testing)$", {
+    ("^(BaseOS|AppStream|PowerTools|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Testing)$", {
         # No binary ISOs for BaseOS (but still generate src ISOs) - RCM-41330
         # No binary ISOs for AppStream (but still generate src ISOs) - RCM-40356
-        # No binary or src ISOs for CRB
+        # No binary or src ISOs for PowerTools
         # No binary or src ISOs for NFV
         # Note: "*" matches only binary architectures.
         "*": True,
@@ -129,8 +129,8 @@ lorax_options = [
 # LOOKASIDE
 variant_as_lookaside = [
     ('AppStream', 'BaseOS'),
-    ('CRB', 'BaseOS'),
-    ('CRB', 'AppStream'),
+    ('PowerTools', 'BaseOS'),
+    ('PowerTools', 'AppStream'),
     ('HighAvailability', 'BaseOS'),
     ('HighAvailability', 'AppStream'),
     ("ResilientStorage", "BaseOS"),
diff --git a/prepopulate-i686.json b/prepopulate-i686.json
index a713181..2fe5841 100644
--- a/prepopulate-i686.json
+++ b/prepopulate-i686.json
@@ -14875,7 +14875,7 @@
       ]
     }
   },
-  "CRB": {
+  "PowerTools": {
     "i386": {
       "389-ds-base": [
         "389-ds-base-libs-debuginfo.i686",
diff --git a/prepopulate.json b/prepopulate.json
index d0eb2da..d3cce8c 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -11002,7 +11002,7 @@
       ]
     }
   },
-  "CRB": {
+  "PowerTools": {
     "x86_64": {
       "CUnit": [
         "CUnit-devel.i686",