aos/common/control_loop/{ControlLoop=>control_loop}
diff --git a/aos/common/common.gyp b/aos/common/common.gyp
index 4b3376b..693c7ae 100644
--- a/aos/common/common.gyp
+++ b/aos/common/common.gyp
@@ -170,7 +170,7 @@
       'target_name': 'controls',
       'type': 'static_library',
       'sources': [
-        'control_loop/ControlLoop.cc',
+        'control_loop/control_loop.cc',
       ],
       'dependencies': [
         '<(AOS)/common/messages/messages.gyp:robot_state',
diff --git a/aos/common/control_loop/ControlLoop-tmpl.h b/aos/common/control_loop/control_loop-tmpl.h
similarity index 100%
rename from aos/common/control_loop/ControlLoop-tmpl.h
rename to aos/common/control_loop/control_loop-tmpl.h
diff --git a/aos/common/control_loop/ControlLoop.cc b/aos/common/control_loop/control_loop.cc
similarity index 84%
rename from aos/common/control_loop/ControlLoop.cc
rename to aos/common/control_loop/control_loop.cc
index ea62d85..4a8ab91 100644
--- a/aos/common/control_loop/ControlLoop.cc
+++ b/aos/common/control_loop/control_loop.cc
@@ -1,4 +1,4 @@
-#include "aos/common/control_loop/ControlLoop.h"
+#include "aos/common/control_loop/control_loop.h"
 
 namespace aos {
 namespace control_loops {
diff --git a/aos/common/control_loop/ControlLoop.h b/aos/common/control_loop/control_loop.h
similarity index 98%
rename from aos/common/control_loop/ControlLoop.h
rename to aos/common/control_loop/control_loop.h
index 8c0ab59..67af8a3 100644
--- a/aos/common/control_loop/ControlLoop.h
+++ b/aos/common/control_loop/control_loop.h
@@ -180,6 +180,6 @@
 }  // namespace control_loops
 }  // namespace aos
 
-#include "aos/common/control_loop/ControlLoop-tmpl.h"  // IWYU pragma: export
+#include "aos/common/control_loop/control_loop-tmpl.h"  // IWYU pragma: export
 
 #endif