diff --git a/y2016/control_loops/drivetrain/drivetrain_base.h b/y2016/control_loops/drivetrain/drivetrain_base.h
index 0186a6c..b0a4bda 100644
--- a/y2016/control_loops/drivetrain/drivetrain_base.h
+++ b/y2016/control_loops/drivetrain/drivetrain_base.h
@@ -3,15 +3,11 @@
 
 #include "frc971/control_loops/drivetrain/drivetrain_config.h"
 
-namespace y2016 {
-namespace control_loops {
-namespace drivetrain {
+namespace y2016::control_loops::drivetrain {
 
 const ::frc971::control_loops::drivetrain::DrivetrainConfig<double> &
 GetDrivetrainConfig();
 
-}  // namespace drivetrain
-}  // namespace control_loops
-}  // namespace y2016
+}  // namespace y2016::control_loops::drivetrain
 
 #endif  // Y2016_CONTROL_LOOPS_DRIVETRAIN_DRIVETRAIN_BASE_H_
diff --git a/y2016/control_loops/shooter/shooter.h b/y2016/control_loops/shooter/shooter.h
index 5aaa1c0..b83ed24 100644
--- a/y2016/control_loops/shooter/shooter.h
+++ b/y2016/control_loops/shooter/shooter.h
@@ -13,9 +13,7 @@
 #include "y2016/control_loops/shooter/shooter_position_generated.h"
 #include "y2016/control_loops/shooter/shooter_status_generated.h"
 
-namespace y2016 {
-namespace control_loops {
-namespace shooter {
+namespace y2016::control_loops::shooter {
 
 namespace {
 constexpr double kTolerance = 10.0;
@@ -94,8 +92,6 @@
   DISALLOW_COPY_AND_ASSIGN(Shooter);
 };
 
-}  // namespace shooter
-}  // namespace control_loops
-}  // namespace y2016
+}  // namespace y2016::control_loops::shooter
 
 #endif  // Y2016_CONTROL_LOOPS_SHOOTER_SHOOTER_H_