diff --git a/src/lib/config/ModelConfig.cc b/src/lib/config/ModelConfig.cc
index e94cc52895..18ad8258bc 100644
--- a/src/lib/config/ModelConfig.cc
+++ b/src/lib/config/ModelConfig.cc
@@ -346,14 +346,16 @@ void ModelConfig::setExpectations(bool isDefault) {
   // Register-Set
   expectations_.addChild(ExpectationNode::createExpectation("Register-Set"));
   if (isa_ == ISA::AArch64) {
-    // TODO: Reduce to 32 once renaming issue has been sorted
+    // TODO: Reduce to 32 once renaming issue has been sorted. Also replace in
+    // ConfigTest.
     expectations_["Register-Set"].addChild(
         ExpectationNode::createExpectation<uint16_t>(38,
                                                      "GeneralPurpose-Count"));
     expectations_["Register-Set"]["GeneralPurpose-Count"]
         .setValueBounds<uint16_t>(38, UINT16_MAX);
 
-    // TODO: Reduce to 32 once renaming issue has been sorted
+    // TODO: Reduce to 32 once renaming issue has been sorted. Also replace in
+    // ConfigTest.
     expectations_["Register-Set"].addChild(
         ExpectationNode::createExpectation<uint16_t>(
             38, "FloatingPoint/SVE-Count"));
@@ -376,15 +378,19 @@ void ModelConfig::setExpectations(bool isDefault) {
     expectations_["Register-Set"]["Matrix-Count"].setValueBounds<uint16_t>(
         1, UINT16_MAX);
   } else if (isa_ == ISA::RV64) {
+    // TODO: Reduce to 32 once renaming issue has been sorted. Also replace in
+    // ConfigTest.
     expectations_["Register-Set"].addChild(
-        ExpectationNode::createExpectation<uint16_t>(32,
+        ExpectationNode::createExpectation<uint16_t>(38,
                                                      "GeneralPurpose-Count"));
     // TODO: Reduce to 32 once renaming issue has been sorted
     expectations_["Register-Set"]["GeneralPurpose-Count"]
         .setValueBounds<uint16_t>(38, UINT16_MAX);
 
+    // TODO: Reduce to 32 once renaming issue has been sorted. Also replace in
+    // ConfigTest.
     expectations_["Register-Set"].addChild(
-        ExpectationNode::createExpectation<uint16_t>(32,
+        ExpectationNode::createExpectation<uint16_t>(38,
                                                      "FloatingPoint-Count"));
     // TODO: Reduce to 32 once renaming issue has been sorted
     expectations_["Register-Set"]["FloatingPoint-Count"]
diff --git a/test/integration/ConfigTest.cc b/test/integration/ConfigTest.cc
index ed0f4124de..931acecf07 100644
--- a/test/integration/ConfigTest.cc
+++ b/test/integration/ConfigTest.cc
@@ -45,8 +45,8 @@ TEST(ConfigTest, Default) {
       "'Streaming-Vector-Length': 128\nFetch:\n  'Fetch-Block-Size': 32\n  "
       "'Loop-Buffer-Size': 32\n  'Loop-Detection-Threshold': "
       "5\n'Process-Image':\n  'Heap-Size': 100000\n  'Stack-Size': "
-      "100000\n'Register-Set':\n  'GeneralPurpose-Count': 32\n  "
-      "'FloatingPoint/SVE-Count': 32\n  'Predicate-Count': 17\n  "
+      "100000\n'Register-Set':\n  'GeneralPurpose-Count': 38\n  "
+      "'FloatingPoint/SVE-Count': 38\n  'Predicate-Count': 17\n  "
       "'Conditional-Count': 1\n  'Matrix-Count': 1\n'Pipeline-Widths':\n  "
       "Commit: 1\n  FrontEnd: 1\n  'LSQ-Completion': 1\n'Queue-Sizes':\n  ROB: "
       "32\n  Load: 16\n  Store: 16\n'Branch-Predictor':\n  'BTB-Tag-Bits': 8\n "
@@ -101,8 +101,8 @@ TEST(ConfigTest, Default) {
       "'Micro-Operations': 0\nFetch:\n  'Fetch-Block-Size': 32\n  "
       "'Loop-Buffer-Size': 32\n  'Loop-Detection-Threshold': "
       "5\n'Process-Image':\n  'Heap-Size': 100000\n  'Stack-Size': "
-      "100000\n'Register-Set':\n  'GeneralPurpose-Count': 32\n  "
-      "'FloatingPoint-Count': 32\n'Pipeline-Widths':\n  Commit: 1\n  FrontEnd: "
+      "100000\n'Register-Set':\n  'GeneralPurpose-Count': 38\n  "
+      "'FloatingPoint-Count': 38\n'Pipeline-Widths':\n  Commit: 1\n  FrontEnd: "
       "1\n  'LSQ-Completion': 1\n'Queue-Sizes':\n  ROB: 32\n  Load: 16\n  "
       "Store: 16\n'Branch-Predictor':\n  'BTB-Tag-Bits': 8\n  "
       "'Saturating-Count-Bits': 2\n  'Global-History-Length': 8\n  "
diff --git a/test/regression/riscv/RISCVRegressionTest.hh b/test/regression/riscv/RISCVRegressionTest.hh
index a62ff78e4f..c6cc985433 100644
--- a/test/regression/riscv/RISCVRegressionTest.hh
+++ b/test/regression/riscv/RISCVRegressionTest.hh
@@ -13,7 +13,7 @@ static const char* RISCV_ADDITIONAL_CONFIG = R"YAML(
   Register-Set:
     {
       GeneralPurpose-Count: 154,
-      Floating-Point-Count: 90,
+      FloatingPoint-Count: 90,
     },
   L1-Data-Memory:
     {