diff --git a/y2014/control_loops/shooter/shooter.cc b/y2014/control_loops/shooter/shooter.cc
index 2a3e0d0..b0ce4ba 100644
--- a/y2014/control_loops/shooter/shooter.cc
+++ b/y2014/control_loops/shooter/shooter.cc
@@ -9,9 +9,7 @@
 #include "y2014/constants.h"
 #include "y2014/control_loops/shooter/shooter_motor_plant.h"
 
-namespace y2014 {
-namespace control_loops {
-namespace shooter {
+namespace y2014::control_loops::shooter {
 
 namespace chrono = ::std::chrono;
 using ::aos::monotonic_clock;
@@ -688,6 +686,4 @@
   return output_builder.Finish();
 }
 
-}  // namespace shooter
-}  // namespace control_loops
-}  // namespace y2014
+}  // namespace y2014::control_loops::shooter
diff --git a/y2014/control_loops/shooter/shooter_lib_test.cc b/y2014/control_loops/shooter/shooter_lib_test.cc
index d7fc0ea..6c6c7e7 100644
--- a/y2014/control_loops/shooter/shooter_lib_test.cc
+++ b/y2014/control_loops/shooter/shooter_lib_test.cc
@@ -19,10 +19,7 @@
 namespace chrono = ::std::chrono;
 using ::aos::monotonic_clock;
 
-namespace y2014 {
-namespace control_loops {
-namespace shooter {
-namespace testing {
+namespace y2014::control_loops::shooter::testing {
 
 using ::frc971::control_loops::testing::kTeamNumber;
 using ::y2014::control_loops::shooter::kMaxExtension;
@@ -808,7 +805,4 @@
 
 // TODO(austin): Test all the timeouts...
 
-}  // namespace testing
-}  // namespace shooter
-}  // namespace control_loops
-}  // namespace y2014
+}  // namespace y2014::control_loops::shooter::testing