diff --git a/frc971/control_loops/claw/claw.gyp b/frc971/control_loops/claw/claw.gyp
index 65472d6..b522a95 100644
--- a/frc971/control_loops/claw/claw.gyp
+++ b/frc971/control_loops/claw/claw.gyp
@@ -8,11 +8,11 @@
         'header_path': 'frc971/control_loops/claw',
       },
       'dependencies': [
-        '<(AOS)/common/common.gyp:control_loop_queues',
+        '<(AOS)/common/controls/controls.gyp:control_loop_queues',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:queues',
       ],
       'export_dependent_settings': [
-        '<(AOS)/common/common.gyp:control_loop_queues',
+        '<(AOS)/common/controls/controls.gyp:control_loop_queues',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:queues',
       ],
       'includes': ['../../../aos/build/queues.gypi'],
@@ -26,7 +26,7 @@
       ],
       'dependencies': [
         'claw_loop',
-        '<(AOS)/common/common.gyp:controls',
+        '<(AOS)/common/controls/controls.gyp:control_loop',
         '<(DEPTH)/frc971/frc971.gyp:constants',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
         '<(AOS)/common/controls/controls.gyp:polytope',
@@ -36,7 +36,7 @@
       ],
       'export_dependent_settings': [
         'claw_loop',
-        '<(AOS)/common/common.gyp:controls',
+        '<(AOS)/common/controls/controls.gyp:control_loop',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
         '<(AOS)/common/controls/controls.gyp:polytope',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:coerce_goal',
@@ -65,7 +65,7 @@
       'dependencies': [
         '<(AOS)/linux_code/linux_code.gyp:init',
         'claw_loop',
-        '<(AOS)/common/common.gyp:controls',
+        '<(AOS)/common/controls/controls.gyp:control_loop',
         '<(DEPTH)/frc971/frc971.gyp:constants',
       ],
     },
diff --git a/frc971/control_loops/drivetrain/drivetrain.gyp b/frc971/control_loops/drivetrain/drivetrain.gyp
index 339e01e..9eb54d2 100644
--- a/frc971/control_loops/drivetrain/drivetrain.gyp
+++ b/frc971/control_loops/drivetrain/drivetrain.gyp
@@ -8,11 +8,11 @@
         'header_path': 'frc971/control_loops/drivetrain',
       },
       'dependencies': [
-        '<(AOS)/common/common.gyp:control_loop_queues',
+        '<(AOS)/common/controls/controls.gyp:control_loop_queues',
         '<(AOS)/common/common.gyp:queues',
       ],
       'export_dependent_settings': [
-        '<(AOS)/common/common.gyp:control_loop_queues',
+        '<(AOS)/common/controls/controls.gyp:control_loop_queues',
         '<(AOS)/common/common.gyp:queues',
       ],
       'includes': ['../../../aos/build/queues.gypi'],
@@ -40,7 +40,7 @@
       ],
       'dependencies': [
         'drivetrain_loop',
-        '<(AOS)/common/common.gyp:controls',
+        '<(AOS)/common/controls/controls.gyp:control_loop',
         '<(DEPTH)/frc971/frc971.gyp:constants',
         '<(AOS)/common/controls/controls.gyp:polytope',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
@@ -54,7 +54,7 @@
         '<(AOS)/common/controls/controls.gyp:polytope',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:coerce_goal',
-        '<(AOS)/common/common.gyp:controls',
+        '<(AOS)/common/controls/controls.gyp:control_loop',
         'drivetrain_loop',
       ],
     },
diff --git a/frc971/control_loops/shooter/shooter.gyp b/frc971/control_loops/shooter/shooter.gyp
index 10e0f4e..30226fd 100755
--- a/frc971/control_loops/shooter/shooter.gyp
+++ b/frc971/control_loops/shooter/shooter.gyp
@@ -8,11 +8,11 @@
         'header_path': 'frc971/control_loops/shooter',
       },
       'dependencies': [
-        '<(AOS)/common/common.gyp:control_loop_queues',
+        '<(AOS)/common/controls/controls.gyp:control_loop_queues',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:queues',
       ],
       'export_dependent_settings': [
-        '<(AOS)/common/common.gyp:control_loop_queues',
+        '<(AOS)/common/controls/controls.gyp:control_loop_queues',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:queues',
       ],
       'includes': ['../../../aos/build/queues.gypi'],
@@ -27,14 +27,14 @@
       ],
       'dependencies': [
         'shooter_loop',
-        '<(AOS)/common/common.gyp:controls',
+        '<(AOS)/common/controls/controls.gyp:control_loop',
         '<(DEPTH)/frc971/frc971.gyp:constants',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
         '<(AOS)/common/logging/logging.gyp:queue_logging',
       ],
       'export_dependent_settings': [
         'shooter_loop',
-        '<(AOS)/common/common.gyp:controls',
+        '<(AOS)/common/controls/controls.gyp:control_loop',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
       ],
     },