diff --git a/aos/controls/BUILD b/aos/controls/BUILD
index 14890d4..027b8ca 100644
--- a/aos/controls/BUILD
+++ b/aos/controls/BUILD
@@ -16,8 +16,8 @@
         "//aos:flatbuffers",
         "//aos:json_to_flatbuffer",
         "//aos/events:simulated_event_loop",
-        "//aos/robot_state:joystick_state_fbs",
-        "//aos/robot_state:robot_state_fbs",
+        "//frc971/input:joystick_state_fbs",
+        "//frc971/input:robot_state_fbs",
         "//aos/testing:googletest",
         "//aos/testing:test_logging",
         "//aos/time",
@@ -77,8 +77,8 @@
         "//aos/events:event_loop",
         "//aos/events:shm_event_loop",
         "//aos/logging",
-        "//aos/robot_state:joystick_state_fbs",
-        "//aos/robot_state:robot_state_fbs",
+        "//frc971/input:joystick_state_fbs",
+        "//frc971/input:robot_state_fbs",
         "//aos/time",
         "//aos/util:log_interval",
     ],
diff --git a/aos/controls/control_loop.h b/aos/controls/control_loop.h
index 6f1b487..efe3493 100644
--- a/aos/controls/control_loop.h
+++ b/aos/controls/control_loop.h
@@ -2,14 +2,15 @@
 #define AOS_CONTROL_LOOP_CONTROL_LOOP_H_
 
 #include <string.h>
+
 #include <atomic>
 
 #include "aos/events/event_loop.h"
-#include "aos/robot_state/joystick_state_generated.h"
-#include "aos/robot_state/robot_state_generated.h"
 #include "aos/time/time.h"
 #include "aos/type_traits/type_traits.h"
 #include "aos/util/log_interval.h"
+#include "frc971/input/joystick_state_generated.h"
+#include "frc971/input/robot_state_generated.h"
 
 namespace aos {
 namespace controls {
diff --git a/aos/controls/control_loop_test.h b/aos/controls/control_loop_test.h
index 536df02..7fbc94a 100644
--- a/aos/controls/control_loop_test.h
+++ b/aos/controls/control_loop_test.h
@@ -7,10 +7,10 @@
 #include "aos/events/simulated_event_loop.h"
 #include "aos/flatbuffers.h"
 #include "aos/json_to_flatbuffer.h"
-#include "aos/robot_state/joystick_state_generated.h"
-#include "aos/robot_state/robot_state_generated.h"
 #include "aos/testing/test_logging.h"
 #include "aos/time/time.h"
+#include "frc971/input/joystick_state_generated.h"
+#include "frc971/input/robot_state_generated.h"
 #include "gtest/gtest.h"
 
 namespace aos {