diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp
index f5be25100..2b1121344 100644
--- a/src/managers/input/InputManager.cpp
+++ b/src/managers/input/InputManager.cpp
@@ -617,7 +617,7 @@ void CInputManager::onMouseButton(IPointer::SButtonEvent e) {
     if (PROTO::inputCapture->isCaptured())
         return;
 
-    m_tmrLastCursorMovement.reset();
+    m_lastCursorMovement.reset();
 
     if (e.state == WL_POINTER_BUTTON_STATE_PRESSED) {
         m_currentlyHeldButtons.push_back(e.button);
@@ -947,12 +947,12 @@ void CInputManager::onMouseFrame() {
         return;
 
     bool shouldSkip = false;
-    if (!g_pSeatManager->mouse.expired() && g_pInputManager->isLocked()) {
-        auto PMONITOR = g_pCompositor->m_pLastMonitor.get();
-        shouldSkip    = PMONITOR && PMONITOR->shouldSkipScheduleFrameOnMouseEvent();
+    if (!g_pSeatManager->m_mouse.expired() && g_pInputManager->isLocked()) {
+        auto PMONITOR = g_pCompositor->m_lastMonitor.get();
+        shouldSkip = PMONITOR && PMONITOR->shouldSkipScheduleFrameOnMouseEvent();
     }
-    g_pSeatManager->isPointerFrameSkipped = shouldSkip;
-    if (!g_pSeatManager->isPointerFrameSkipped)
+    g_pSeatManager->m_isPointerFrameSkipped = shouldSkip;
+    if (!g_pSeatManager->m_isPointerFrameSkipped)
         g_pSeatManager->sendPointerFrame();
 }
 
diff --git a/src/protocols/InputCapture.cpp b/src/protocols/InputCapture.cpp
index a7c911f62..4614ff32a 100644
--- a/src/protocols/InputCapture.cpp
+++ b/src/protocols/InputCapture.cpp
@@ -24,7 +24,7 @@ void CInputCaptureProtocol::bindManager(wl_client* client, void* data, uint32_t
         g_pHyprRenderer->ensureCursorRenderingMode();
     });
 
-    sendKeymap(g_pSeatManager->keyboard.lock(), RESOURCE);
+    sendKeymap(g_pSeatManager->m_keyboard.lock(), RESOURCE);
 }
 
 bool CInputCaptureProtocol::isCaptured() {
@@ -33,7 +33,7 @@ bool CInputCaptureProtocol::isCaptured() {
 
 void CInputCaptureProtocol::updateKeymap() {
     for (const auto& manager : m_vManagers)
-        sendKeymap(g_pSeatManager->keyboard.lock(), manager);
+        sendKeymap(g_pSeatManager->m_keyboard.lock(), manager);
 }
 
 void CInputCaptureProtocol::sendMotion(const Vector2D& absolutePosition, const Vector2D& delta) {
@@ -45,7 +45,7 @@ void CInputCaptureProtocol::sendMotion(const Vector2D& absolutePosition, const V
 void CInputCaptureProtocol::sendKeymap(SP<IKeyboard> keyboard, const UP<CHyprlandInputCaptureManagerV1>& manager) {
     if (!keyboard)
         return;
-    manager->sendKeymap(HYPRLAND_INPUT_CAPTURE_MANAGER_V1_KEYMAP_FORMAT_XKB_V1, keyboard->xkbKeymapFD.get(), keyboard->xkbKeymapString.length() + 1);
+    manager->sendKeymap(HYPRLAND_INPUT_CAPTURE_MANAGER_V1_KEYMAP_FORMAT_XKB_V1, keyboard->m_xkbKeymapFD.get(), keyboard->m_xkbKeymapString.length() + 1);
 }
 
 void CInputCaptureProtocol::forceRelease() {
diff --git a/src/protocols/core/Output.cpp b/src/protocols/core/Output.cpp
index 34d5a619e..36108ed5a 100644
--- a/src/protocols/core/Output.cpp
+++ b/src/protocols/core/Output.cpp
@@ -76,8 +76,8 @@ void CWLOutputResource::updateState() {
 
     m_resource->sendMode((wl_output_mode)(WL_OUTPUT_MODE_CURRENT), m_monitor->m_pixelSize.x, m_monitor->m_pixelSize.y, m_monitor->m_refreshRate * 1000.0);
 
-    resource->sendGeometry(monitor->vecPosition.x, monitor->vecPosition.y, monitor->output->physicalSize.x, monitor->output->physicalSize.y, (wl_output_subpixel)monitor->output->subpixel, monitor->output->make.c_str(),
-                           monitor->output->model.c_str(), monitor->transform);
+    m_resource->sendGeometry(m_monitor->m_position.x, m_monitor->m_position.y, m_monitor->m_output->physicalSize.x, m_monitor->m_output->physicalSize.y, (wl_output_subpixel)m_monitor->m_output->subpixel, m_monitor->m_output->make.c_str(),
+                           m_monitor->m_output->model.c_str(), m_monitor->m_transform);
 
     if (m_resource->version() >= 2)
         m_resource->sendDone();
diff --git a/subprojects/hyprland-protocols b/subprojects/hyprland-protocols
index 3a5c2bda1..5433c38e9 160000
--- a/subprojects/hyprland-protocols
+++ b/subprojects/hyprland-protocols
@@ -1 +1 @@
-Subproject commit 3a5c2bda1c1a4e55cc1330c782547695a93f05b2
+Subproject commit 5433c38e9755e83905376ed0faf5c624869e24b9