diff --git a/vscode-wpilib/resources/cpp_replacements.json b/vscode-wpilib/resources/cpp_replacements.json
index d42f51ec..b2cdd2af 100644
--- a/vscode-wpilib/resources/cpp_replacements.json
+++ b/vscode-wpilib/resources/cpp_replacements.json
@@ -46,7 +46,11 @@
       { "from": "wpi[\\\\/]numbers", "to": "numbers" },
       { "from": "wpi::numbers::", "to": "std::numbers::" },
       { "from": "wpi[\\\\/]span", "to": "span" },
-      { "from": "wpi::span<", "to": "std::span<" }
+      { "from": "wpi::span<", "to": "std::span<" },
+      { "from": "frc::CommandBase", "to": "frc::Command" },
+      { "from": "frc::SubsystemBase", "to": "frc::Subsystem" }
+      { "from": "frc2[\\\\/]command[\\\\/]CommandBase[.]h", "to": "frc2/command/Command.h" },
+      { "from": "frc2[\\\\/]command[\\\\/]SubsystemBase[.]h", "to": "frc2/command/Subsystem.h" }
     ]
   }
 ]
diff --git a/vscode-wpilib/resources/java_replacements.json b/vscode-wpilib/resources/java_replacements.json
index eb43f6c7..8cd6db4d 100644
--- a/vscode-wpilib/resources/java_replacements.json
+++ b/vscode-wpilib/resources/java_replacements.json
@@ -138,7 +138,9 @@
       { "from": "LiveWindow[.]getInstance[(][)][.]", "to": "LiveWindow." },
       { "from": "Preferences[.]getInstance[(][)][.]", "to": "Preferences." },
       { "from": "SendableRegistry[.]getInstance[(][)][.]", "to": "SendableRegistry." },
-      { "from": "[.]get(\\w*)[(](?:GenericHID[.])?Hand[.]k(\\w*)[)]", "to": ".get$2$1()" }
+      { "from": "[.]get(\\w*)[(](?:GenericHID[.])?Hand[.]k(\\w*)[)]", "to": ".get$2$1()" },
+      { "from": "CommandBase", "to": "Command" },
+      { "from": "SubsystemBase", "to": "Subsystem" }
     ]
   }
 ]