diff --git a/y2024/control_loops/drivetrain/drivetrain_base.cc b/y2024/control_loops/drivetrain/drivetrain_base.cc
index 88b74f9..325dae8 100644
--- a/y2024/control_loops/drivetrain/drivetrain_base.cc
+++ b/y2024/control_loops/drivetrain/drivetrain_base.cc
@@ -15,9 +15,7 @@
 
 namespace chrono = ::std::chrono;
 
-namespace y2024 {
-namespace control_loops {
-namespace drivetrain {
+namespace y2024::control_loops::drivetrain {
 
 using ::frc971::constants::ShifterHallEffect;
 
@@ -85,6 +83,4 @@
   return kDrivetrainConfig;
 };
 
-}  // namespace drivetrain
-}  // namespace control_loops
-}  // namespace y2024
+}  // namespace y2024::control_loops::drivetrain
diff --git a/y2024/control_loops/superstructure/superstructure.cc b/y2024/control_loops/superstructure/superstructure.cc
index abb5536..bb89021 100644
--- a/y2024/control_loops/superstructure/superstructure.cc
+++ b/y2024/control_loops/superstructure/superstructure.cc
@@ -9,9 +9,7 @@
 DEFINE_bool(ignore_distance, false,
             "If true, ignore distance when shooting and obay joystick_reader");
 
-namespace y2024 {
-namespace control_loops {
-namespace superstructure {
+namespace y2024::control_loops::superstructure {
 
 using ::aos::monotonic_clock;
 
@@ -73,6 +71,4 @@
               : 0.0);
 }
 
-}  // namespace superstructure
-}  // namespace control_loops
-}  // namespace y2024
\ No newline at end of file
+}  // namespace y2024::control_loops::superstructure
diff --git a/y2024/control_loops/superstructure/superstructure_lib_test.cc b/y2024/control_loops/superstructure/superstructure_lib_test.cc
index 85e16b2..bcda3ae 100644
--- a/y2024/control_loops/superstructure/superstructure_lib_test.cc
+++ b/y2024/control_loops/superstructure/superstructure_lib_test.cc
@@ -17,10 +17,7 @@
 DEFINE_string(output_folder, "",
               "If set, logs all channels to the provided logfile.");
 
-namespace y2024 {
-namespace control_loops {
-namespace superstructure {
-namespace testing {
+namespace y2024::control_loops::superstructure::testing {
 
 namespace chrono = std::chrono;
 
@@ -281,7 +278,4 @@
   RunFor(chrono::seconds(2));
   CheckIfZeroed();
 }
-}  // namespace testing
-}  // namespace superstructure
-}  // namespace control_loops
-}  // namespace y2024
+}  // namespace y2024::control_loops::superstructure::testing