diff --git a/y2014/control_loops/claw/claw.cc b/y2014/control_loops/claw/claw.cc
index 2fb93b4..39ee7a4 100644
--- a/y2014/control_loops/claw/claw.cc
+++ b/y2014/control_loops/claw/claw.cc
@@ -40,9 +40,7 @@
 // If a claw runs up against a movable limit, move both claws outwards to get
 // out of the condition.
 
-namespace y2014 {
-namespace control_loops {
-namespace claw {
+namespace y2014::control_loops::claw {
 
 using ::frc971::HallEffectTracker;
 using ::frc971::control_loops::DoCoerceGoal;
@@ -1019,6 +1017,4 @@
   was_enabled_ = enabled;
 }
 
-}  // namespace claw
-}  // namespace control_loops
-}  // namespace y2014
+}  // namespace y2014::control_loops::claw
diff --git a/y2014/control_loops/claw/claw_lib_test.cc b/y2014/control_loops/claw/claw_lib_test.cc
index 8886cda..de9b6bc 100644
--- a/y2014/control_loops/claw/claw_lib_test.cc
+++ b/y2014/control_loops/claw/claw_lib_test.cc
@@ -15,10 +15,7 @@
 #include "y2014/control_loops/claw/claw_position_generated.h"
 #include "y2014/control_loops/claw/claw_status_generated.h"
 
-namespace y2014 {
-namespace control_loops {
-namespace claw {
-namespace testing {
+namespace y2014::control_loops::claw::testing {
 
 using ::aos::monotonic_clock;
 using ::frc971::HallEffectStructT;
@@ -659,7 +656,4 @@
   VerifyNearGoal();
 }
 
-}  // namespace testing
-}  // namespace claw
-}  // namespace control_loops
-}  // namespace y2014
+}  // namespace y2014::control_loops::claw::testing