diff --git a/library/phx/display/display_system_window.cpp b/library/phx/display/display_system_window.cpp
index b5ca76366c272ee271027b2d4eeb73c9f7405472..0b1fb0e158c7989d7f13e60a856e4298fe367696 100644
--- a/library/phx/display/display_system_window.cpp
+++ b/library/phx/display/display_system_window.cpp
@@ -76,7 +76,7 @@ void DisplaySystemWindow::CreateRenderTarget(Scene* scene, float field_of_view,
 
 boost::signals2::connection DisplaySystemWindow::AddQuitCallback(
     const std::function<void()>& callback) {
-  return sdl_event_receiver.quit_signal_.connect(callback);
+  return sdl_event_receiver_.quit_signal_.connect(callback);
 }
 void DisplaySystemWindow::SDLEventReceiver::OnSDLEvent(const SDL_Event& event) {
   if (event.type == SDL_QUIT) quit_signal_();
diff --git a/library/phx/display/display_system_window.hpp b/library/phx/display/display_system_window.hpp
index 09d2587a0b3e86a8a611cd0951e1f90898909c3b..ec9b779f52de40f29698bad039e4f78bc0491998 100644
--- a/library/phx/display/display_system_window.hpp
+++ b/library/phx/display/display_system_window.hpp
@@ -74,7 +74,7 @@ class PHOENIX_EXPORT DisplaySystemWindow : public DisplaySystem {
   // other SDLDevice like Mouse or Keyboard is present the quit signal is never
   // fired. The rational behind that is that the SDL Events are only polled from
   // within the DeviceSystem
-  SDLEventReceiver sdl_event_receiver;
+  SDLEventReceiver sdl_event_receiver_;
 };
 
 template <typename... Arguments>
diff --git a/library/phx/input/sdl_device.cpp b/library/phx/input/sdl_device.cpp
index 298d6cdc9f3612721dbba816aae9e340b36c7fa9..38e2d07505e81b11e404ab28d70584b6a0d13a78 100644
--- a/library/phx/input/sdl_device.cpp
+++ b/library/phx/input/sdl_device.cpp
@@ -28,14 +28,14 @@ namespace phx {
 
 int SDLDevice::reference_counter_ = 0;
 std::mutex SDLDevice::SDL_event_init_mutex_;
-SDLDevice::SDLEventDistributer SDLDevice::SDL_event_distributer;
+SDLDevice::SDLEventDistributer SDLDevice::SDL_event_distributer_;
 
 SDLDevice::SDLDevice() {
   SDL_event_init_mutex_.lock();
   if (reference_counter_ == 0) {
     SDL_Init(SDL_INIT_EVENTS);
   }
-  SDL_event_distributer.AddDevice(this);
+  SDL_event_distributer_.AddDevice(this);
   reference_counter_++;
   SDL_event_init_mutex_.unlock();
 }
@@ -46,11 +46,11 @@ SDLDevice::~SDLDevice() {
   if (reference_counter_ == 0) {
     SDL_QuitSubSystem(SDL_INIT_EVENTS);
   }
-  SDL_event_distributer.RemoveDevice(this);
+  SDL_event_distributer_.RemoveDevice(this);
   SDL_event_init_mutex_.unlock();
 }
 
-void SDLDevice::Update() { SDL_event_distributer.Update(); }
+void SDLDevice::Update() { SDL_event_distributer_.Update(); }
 
 void SDLDevice::SDLEventDistributer::Update() {
   SDL_Event event;
diff --git a/library/phx/input/sdl_device.hpp b/library/phx/input/sdl_device.hpp
index 6149a9a25c619a8f984c9c697903fdd1317d2440..e129678f8b583ab813807cb6e0ee55006f673fe3 100644
--- a/library/phx/input/sdl_device.hpp
+++ b/library/phx/input/sdl_device.hpp
@@ -52,7 +52,7 @@ class PHOENIX_EXPORT SDLDevice : public Device {
     virtual ~SDLEventDistributer() = default;
     void Update() override;
   };
-  static SDLEventDistributer SDL_event_distributer;
+  static SDLEventDistributer SDL_event_distributer_;
 
  private:
   static int reference_counter_;
diff --git a/library/phx/input/tracked_device.cpp b/library/phx/input/tracked_device.cpp
index 05582a0dc7bde089eb12fc24f5b79779a2b5d4e3..067cebb43aa6df6be959d5ce0bf029aba310854c 100644
--- a/library/phx/input/tracked_device.cpp
+++ b/library/phx/input/tracked_device.cpp
@@ -32,7 +32,7 @@ namespace phx {
 vr::IVRSystem* TrackedDevice::vr_system_ = nullptr;
 int TrackedDevice::reference_counter_ = 0;
 std::mutex TrackedDevice::openVR_init_mutex_;
-TrackedDevice::OpenVREventDistributer TrackedDevice::vr_event_distributer;
+TrackedDevice::OpenVREventDistributer TrackedDevice::vr_event_distributer_;
 std::vector<vr::TrackedDevicePose_t> TrackedDevice::last_wait_get_poses_;
 
 TrackedDevice::TrackedDevice() {
@@ -45,7 +45,7 @@ TrackedDevice::TrackedDevice() {
       throw std::runtime_error("OpenVR cannot be initialized!");
     }
   }
-  vr_event_distributer.AddDevice(this);
+  vr_event_distributer_.AddDevice(this);
   reference_counter_++;
   openVR_init_mutex_.unlock();
 }
@@ -57,7 +57,7 @@ TrackedDevice::~TrackedDevice() {
     vr::VR_Shutdown();
     vr_system_ = nullptr;
   }
-  vr_event_distributer.RemoveDevice(this);
+  vr_event_distributer_.RemoveDevice(this);
   openVR_init_mutex_.unlock();
 }
 
@@ -85,7 +85,7 @@ void TrackedDevice::Update() {
     id_ = vr::k_unTrackedDeviceIndexInvalid;
   }
 
-  vr_event_distributer.Update();
+  vr_event_distributer_.Update();
 }
 
 glm::mat4 TrackedDevice::GetPose() const { return pose_; }
diff --git a/library/phx/input/tracked_device.hpp b/library/phx/input/tracked_device.hpp
index 7005d5f0557ddf5702258aba4d88bfd4baa09ed0..554bab92e6517fd85a97118bec55b234a7bb160d 100644
--- a/library/phx/input/tracked_device.hpp
+++ b/library/phx/input/tracked_device.hpp
@@ -59,7 +59,7 @@ class PHOENIX_EXPORT TrackedDevice : public Device {
     virtual ~OpenVREventDistributer() = default;
     void Update() override;
   };
-  static OpenVREventDistributer vr_event_distributer;
+  static OpenVREventDistributer vr_event_distributer_;
 
   static vr::IVRSystem* vr_system_;
   static std::vector<vr::TrackedDevicePose_t> last_wait_get_poses_;