diff --git a/FlippR-Driver/include/Event.h b/FlippR-Driver/include/Event.h
index cea1296..657342e 100644
--- a/FlippR-Driver/include/Event.h
+++ b/FlippR-Driver/include/Event.h
@@ -12,7 +12,9 @@
 #include <string>
 
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 
 class Event
diff --git a/FlippR-Driver/include/IInputDriver.h b/FlippR-Driver/include/IInputDriver.h
index 6376ff5..c72959d 100644
--- a/FlippR-Driver/include/IInputDriver.h
+++ b/FlippR-Driver/include/IInputDriver.h
@@ -11,7 +11,9 @@
 #include "IEventHandler.h"
 #include <memory>
 
-namespace FlippR_Driver::Input {
+namespace FlippR_Driver
+{
+namespace Input {
 
 class IInputDriver
 {
diff --git a/FlippR-Driver/src/input/Detector.cpp b/FlippR-Driver/src/input/Detector.cpp
index c89f01b..d71fae6 100644
--- a/FlippR-Driver/src/input/Detector.cpp
+++ b/FlippR-Driver/src/input/Detector.cpp
@@ -12,7 +12,9 @@
 
 #include "utilities/config.h"
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 
 Detector::Detector(std::unique_ptr<IInputGPIOInterface> input_gpio_interface, std::map<char, std::shared_ptr<Event>> events, std::shared_ptr<IEventNotifier> event_notifier) :
diff --git a/FlippR-Driver/src/input/Detector.h b/FlippR-Driver/src/input/Detector.h
index 3619724..4a33e14 100644
--- a/FlippR-Driver/src/input/Detector.h
+++ b/FlippR-Driver/src/input/Detector.h
@@ -24,7 +24,9 @@
 #include "Event.h"
 #include "IEventNotifier.h"
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 
 class Detector : public IDetector
diff --git a/FlippR-Driver/src/input/ErrorEvent.hpp b/FlippR-Driver/src/input/ErrorEvent.hpp
index 2918c65..a451381 100644
--- a/FlippR-Driver/src/input/ErrorEvent.hpp
+++ b/FlippR-Driver/src/input/ErrorEvent.hpp
@@ -10,7 +10,9 @@
 
 #include "Event.h"
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 
 class ErrorEvent : public Event
diff --git a/FlippR-Driver/src/input/Event.cpp b/FlippR-Driver/src/input/Event.cpp
index c7df27b..8e3a199 100644
--- a/FlippR-Driver/src/input/Event.cpp
+++ b/FlippR-Driver/src/input/Event.cpp
@@ -8,7 +8,9 @@
 
 #include "utilities/config.h"
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 
 Event::Event(char address, int priority, std::string name) :
diff --git a/FlippR-Driver/src/input/EventHandler.cpp b/FlippR-Driver/src/input/EventHandler.cpp
index 917751d..a268bb2 100644
--- a/FlippR-Driver/src/input/EventHandler.cpp
+++ b/FlippR-Driver/src/input/EventHandler.cpp
@@ -7,7 +7,9 @@
 #include "EventHandler.h"
 #include "utilities/config.h"
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 
   EventHandler::EventHandler(std::shared_ptr<IInputDriver> input_driver) :
diff --git a/FlippR-Driver/src/input/EventHandler.h b/FlippR-Driver/src/input/EventHandler.h
index 55ebe8b..8a7a6a7 100644
--- a/FlippR-Driver/src/input/EventHandler.h
+++ b/FlippR-Driver/src/input/EventHandler.h
@@ -17,7 +17,9 @@
 #include "IEventHandler.h"
 #include "Event.h"
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 class EventHandler;
 
diff --git a/FlippR-Driver/src/input/EventNotifier.cpp b/FlippR-Driver/src/input/EventNotifier.cpp
index 7db6cb7..e9254e9 100644
--- a/FlippR-Driver/src/input/EventNotifier.cpp
+++ b/FlippR-Driver/src/input/EventNotifier.cpp
@@ -11,7 +11,9 @@
 
 #include "EventNotifier.h"
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 
 EventNotifier::EventNotifier(IBlockingQueue<Event>* queue) :
diff --git a/FlippR-Driver/src/input/EventNotifier.h b/FlippR-Driver/src/input/EventNotifier.h
index a9b2282..322c887 100644
--- a/FlippR-Driver/src/input/EventNotifier.h
+++ b/FlippR-Driver/src/input/EventNotifier.h
@@ -21,7 +21,9 @@
 
 #define HANDLER_TIMEOUT 2000
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 
 class EventNotifier : public IEventNotifier
diff --git a/FlippR-Driver/src/input/IDetector.h b/FlippR-Driver/src/input/IDetector.h
index b31b310..c74e0bb 100644
--- a/FlippR-Driver/src/input/IDetector.h
+++ b/FlippR-Driver/src/input/IDetector.h
@@ -9,7 +9,9 @@
 #define SRC_INPUT_IDETECTOR_H_
 
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 
 class IDetector
diff --git a/FlippR-Driver/src/input/IEventNotifier.h b/FlippR-Driver/src/input/IEventNotifier.h
index 6d6ad3f..fa3fc6f 100644
--- a/FlippR-Driver/src/input/IEventNotifier.h
+++ b/FlippR-Driver/src/input/IEventNotifier.h
@@ -12,7 +12,9 @@
 #include "IEventHandler.h"
 #include <memory>
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 
 class IEventNotifier
diff --git a/FlippR-Driver/src/input/InputDriver.cpp b/FlippR-Driver/src/input/InputDriver.cpp
index 99dc779..e0d478c 100644
--- a/FlippR-Driver/src/input/InputDriver.cpp
+++ b/FlippR-Driver/src/input/InputDriver.cpp
@@ -10,7 +10,9 @@
 
 #include <input/ErrorEvent.hpp>
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 
 InputDriver::InputDriver(std::shared_ptr<IEventNotifier> event_notifier, std::unique_ptr<IDetector> detector, std::map<std::string, std::shared_ptr<Event>> events) :
diff --git a/FlippR-Driver/src/input/InputDriver.h b/FlippR-Driver/src/input/InputDriver.h
index 6f2cad2..2ea3f14 100644
--- a/FlippR-Driver/src/input/InputDriver.h
+++ b/FlippR-Driver/src/input/InputDriver.h
@@ -13,7 +13,9 @@
 #include "IInputDriver.h"
 #include "IDetector.h"
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 
 class InputDriver : public IInputDriver
diff --git a/FlippR-Driver/src/input/InputDriverFactory.cpp b/FlippR-Driver/src/input/InputDriverFactory.cpp
index 9752c3e..4bdb52a 100644
--- a/FlippR-Driver/src/input/InputDriverFactory.cpp
+++ b/FlippR-Driver/src/input/InputDriverFactory.cpp
@@ -18,7 +18,9 @@
 using namespace nlohmann;
 
 
-namespace FlippR_Driver::Input {
+namespace FlippR_Driver
+{
+namespace Input {
 
   std::shared_ptr<IInputDriver>
   InputDriverFactory::get_InputDriver(std::istream &input_config_stream, std::istream &matrix_config_stream) {
diff --git a/FlippR-Driver/src/input/InputDriverFactory.h b/FlippR-Driver/src/input/InputDriverFactory.h
index b5eea1d..d4435ff 100644
--- a/FlippR-Driver/src/input/InputDriverFactory.h
+++ b/FlippR-Driver/src/input/InputDriverFactory.h
@@ -18,7 +18,9 @@
 #include "json/json.hpp"
 #include "IEventNotifier.h"
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 class InputDriverFactory
 {
diff --git a/FlippR-Driver/tests/input/TestDetector.cpp b/FlippR-Driver/tests/input/TestDetector.cpp
index 8a88477..f6340ba 100644
--- a/FlippR-Driver/tests/input/TestDetector.cpp
+++ b/FlippR-Driver/tests/input/TestDetector.cpp
@@ -23,7 +23,9 @@
 
 
 using namespace fakeit;
-using namespace FlippR_Driver::Input;
+using namespace FlippR_Driver
+{
+namespace Input;
 
 
 SCENARIO("Creating a Detector object", "")
diff --git a/FlippR-Driver/tests/input/TestEventNotifier.cpp b/FlippR-Driver/tests/input/TestEventNotifier.cpp
index c2c520a..df81f12 100644
--- a/FlippR-Driver/tests/input/TestEventNotifier.cpp
+++ b/FlippR-Driver/tests/input/TestEventNotifier.cpp
@@ -20,7 +20,9 @@
 
 #include "input/EventNotifier.h"
 
-using namespace FlippR_Driver::Input;
+using namespace FlippR_Driver
+{
+namespace Input;
 using namespace fakeit;
 
 SCENARIO("An EventNotifier gets created", "[construction]")
diff --git a/FlippR-Driver/tests/input/TestInputDriver.cpp b/FlippR-Driver/tests/input/TestInputDriver.cpp
index 53e582d..2c6038d 100644
--- a/FlippR-Driver/tests/input/TestInputDriver.cpp
+++ b/FlippR-Driver/tests/input/TestInputDriver.cpp
@@ -19,7 +19,9 @@
 
 
 using namespace fakeit;
-using namespace FlippR_Driver::Input;
+using namespace FlippR_Driver
+{
+namespace Input;
 
 SCENARIO("An InputDriver gets created", "[construction}")
 {
diff --git a/FlippR-Driver/tests/input/TestInputDriverFactory.cpp b/FlippR-Driver/tests/input/TestInputDriverFactory.cpp
index 4331d38..1630632 100644
--- a/FlippR-Driver/tests/input/TestInputDriverFactory.cpp
+++ b/FlippR-Driver/tests/input/TestInputDriverFactory.cpp
@@ -16,7 +16,9 @@
 
 #include "input/EventNotifier.h"
 
-using namespace FlippR_Driver::Input;
+using namespace FlippR_Driver
+{
+namespace Input;
 using namespace fakeit;
 
 SCENARIO("The factory creates a InputDriver")
diff --git a/FlippR-Driver/tests/input/mocks/EventHandlerMock.hpp b/FlippR-Driver/tests/input/mocks/EventHandlerMock.hpp
index 728ebf5..452637f 100644
--- a/FlippR-Driver/tests/input/mocks/EventHandlerMock.hpp
+++ b/FlippR-Driver/tests/input/mocks/EventHandlerMock.hpp
@@ -8,7 +8,9 @@
 #ifndef SRC_TESTS_INPUT_MOCKS_EVENTHANDLERMOCK_HPP_
 #define SRC_TESTS_INPUT_MOCKS_EVENTHANDLERMOCK_HPP_
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 class EventHandler;
 class Event;
diff --git a/FlippR-Driver/tests/input/mocks/EventNotifierMock.hpp b/FlippR-Driver/tests/input/mocks/EventNotifierMock.hpp
index 3ae9d32..6a8ccb5 100644
--- a/FlippR-Driver/tests/input/mocks/EventNotifierMock.hpp
+++ b/FlippR-Driver/tests/input/mocks/EventNotifierMock.hpp
@@ -8,7 +8,9 @@
 #ifndef SRC_TESTS_INPUT_MOCKS_EVENTNOTIFIERMOCK_HPP_
 #define SRC_TESTS_INPUT_MOCKS_EVENTNOTIFIERMOCK_HPP_
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 class EventNotifier;
 class EventHandler;
diff --git a/FlippR-Driver/tests/input/mocks/InputDriverMock.hpp b/FlippR-Driver/tests/input/mocks/InputDriverMock.hpp
index 3ceab79..e03d254 100644
--- a/FlippR-Driver/tests/input/mocks/InputDriverMock.hpp
+++ b/FlippR-Driver/tests/input/mocks/InputDriverMock.hpp
@@ -8,7 +8,9 @@
 #ifndef SRC_TESTS_INPUT_MOCKS_INPUTDRIVERMOCK_HPP_
 #define SRC_TESTS_INPUT_MOCKS_INPUTDRIVERMOCK_HPP_
 
-namespace FlippR_Driver::Input
+namespace FlippR_Driver
+{
+namespace Input
 {
 class InputDriver;
 class EventHandler;