diff --git a/firmware/application/tpms_app.hpp b/firmware/application/tpms_app.hpp
index e22cda8d..41d4b797 100644
--- a/firmware/application/tpms_app.hpp
+++ b/firmware/application/tpms_app.hpp
@@ -29,7 +29,6 @@
 #include "manchester.hpp"
 #include "log_file.hpp"
 
-namespace tpms {
 
 template<typename T>
 class Optional {
@@ -46,6 +45,8 @@ private:
 	bool valid_;
 };
 
+namespace tpms {
+
 class TransponderID {
 public:
 	constexpr TransponderID(