diff --git a/hal/src/main/native/include/wpi/hal/Main.h b/hal/src/main/native/include/wpi/hal/Main.h
index accb80b335..5808af16ab 100644
--- a/hal/src/main/native/include/wpi/hal/Main.h
+++ b/hal/src/main/native/include/wpi/hal/Main.h
@@ -25,7 +25,7 @@ extern "C" {
  * require the GUI be run in the main thread.
  *
  * To be effective, this function must be called before the robot code starts
- * the main loop (e.g. by frc::StartRobot()).
+ * the main loop (e.g. by wpi::StartRobot()).
  *
  * @param param parameter data to pass to mainFunc and exitFunc
  * @param mainFunc the function to be run when HAL_RunMain() is called.
diff --git a/ntcoreffi/src/main/native/cpp/DataLogManager.cpp b/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
index 13e808a2f7..23b03c550f 100644
--- a/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
+++ b/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
@@ -30,7 +30,7 @@ namespace warn {
 static constexpr int Warning = 16;
 }  // namespace warn
 
-namespace frc {
+namespace wpi {
 void ReportErrorV(int32_t status, const char* fileName, int lineNumber,
                   const char* funcName, fmt::string_view format,
                   fmt::format_args args) {
@@ -55,12 +55,12 @@ inline void ReportError(int32_t status, const char* fileName, int lineNumber,
   ReportErrorV(status, fileName, lineNumber, funcName, format,
                fmt::make_format_args(args...));
 }
-}  // namespace frc
+}  // namespace wpi
 
 #define WPILIB_ReportError(status, format, ...)                       \
   do {                                                             \
     if ((status) != 0) {                                           \
-      ::frc::ReportError(status, __FILE__, __LINE__, __FUNCTION__, \
+      ::wpi::ReportError(status, __FILE__, __LINE__, __FUNCTION__, \
                          format __VA_OPT__(, ) __VA_ARGS__);       \
     }                                                              \
   } while (0)