diff --git a/apriltag/src/main/python/pyproject.toml b/apriltag/src/main/python/pyproject.toml
index 0aefca734b..708a9273ab 100644
--- a/apriltag/src/main/python/pyproject.toml
+++ b/apriltag/src/main/python/pyproject.toml
@@ -63,7 +63,7 @@ wraps = ["robotpy-native-apriltag"]
 depends = ["wpiutil", "wpimath"]
 
 [tool.semiwrap.extension_modules."robotpy_apriltag._apriltag".headers]
-# frc/apriltag
+# wpi/apriltag
 AprilTag = "wpi/apriltag/AprilTag.hpp"
 AprilTagDetection = "wpi/apriltag/AprilTagDetection.hpp"
 AprilTagDetector = "wpi/apriltag/AprilTagDetector.hpp"
diff --git a/romiVendordep/src/main/python/pyproject.toml b/romiVendordep/src/main/python/pyproject.toml
index 586b4fedd3..2b7a337888 100644
--- a/romiVendordep/src/main/python/pyproject.toml
+++ b/romiVendordep/src/main/python/pyproject.toml
@@ -53,7 +53,7 @@ depends = [
 ]
 
 [tool.semiwrap.extension_modules."romi._romi".headers]
-# frc/romi
+# wpi/romi
 OnBoardIO = "wpi/romi/OnBoardIO.hpp"
 RomiGyro = "wpi/romi/RomiGyro.hpp"
 RomiMotor = "wpi/romi/RomiMotor.hpp"
diff --git a/wpilibj/src/main/java/org/wpilib/system/Filesystem.java b/wpilibj/src/main/java/org/wpilib/system/Filesystem.java
index b403fc6147..418284ca54 100644
--- a/wpilibj/src/main/java/org/wpilib/system/Filesystem.java
+++ b/wpilibj/src/main/java/org/wpilib/system/Filesystem.java
@@ -8,7 +8,7 @@ import java.io.File;
 import org.wpilib.framework.RobotBase;
 
 /**
- * Class for interacting with the Filesystem, particularly, interacting with FRC-related paths on
+ * Class for interacting with the Filesystem, particularly, interacting with WPILib-related paths on
  * the system, such as the launch and deploy directories.
  *
  * <p>This class is primarily used for obtaining resources in src/main/deploy, and the systemcore
diff --git a/xrpVendordep/src/main/python/pyproject.toml b/xrpVendordep/src/main/python/pyproject.toml
index 9d710f3764..ec014b053d 100644
--- a/xrpVendordep/src/main/python/pyproject.toml
+++ b/xrpVendordep/src/main/python/pyproject.toml
@@ -60,7 +60,7 @@ wraps = ["robotpy-native-xrp"]
 depends = ["wpilib", "wpimath"]
 
 [tool.semiwrap.extension_modules."xrp._xrp".headers]
-# frc/xrp
+# wpi/xrp
 XRPGyro = "wpi/xrp/XRPGyro.hpp"
 XRPMotor = "wpi/xrp/XRPMotor.hpp"
 XRPOnBoardIO = "wpi/xrp/XRPOnBoardIO.hpp"