diff --git a/Boards/CYD-2432S024C/Source/CYD2432S024C.cpp b/Boards/CYD-2432S024C/Source/CYD2432S024C.cpp
index d9455601..56f3b2ac 100644
--- a/Boards/CYD-2432S024C/Source/CYD2432S024C.cpp
+++ b/Boards/CYD-2432S024C/Source/CYD2432S024C.cpp
@@ -73,7 +73,7 @@ const tt::hal::Configuration cyd_2432S024c_config = {
             .initMode = tt::hal::spi::InitMode::ByTactility,
             .canReinit = false,
             .hasMutableConfiguration = false,
-            .lock = tt::lvgl::getLvglSyncLock() // esp_lvgl_port owns the lock for the display
+            .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
         },
         tt::hal::spi::Configuration {
             .device = SPI3_HOST,
diff --git a/Boards/LilygoTdeck/Source/LilygoTdeck.cpp b/Boards/LilygoTdeck/Source/LilygoTdeck.cpp
index e1e57bfd..9ba410be 100644
--- a/Boards/LilygoTdeck/Source/LilygoTdeck.cpp
+++ b/Boards/LilygoTdeck/Source/LilygoTdeck.cpp
@@ -78,7 +78,7 @@ extern const tt::hal::Configuration lilygo_tdeck = {
             .initMode = tt::hal::spi::InitMode::ByTactility,
             .canReinit = false,
             .hasMutableConfiguration = false,
-            .lock = tt::lvgl::getLvglSyncLock() // esp_lvgl_port owns the lock for the display
+            .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
         }
     },
     .uart {
diff --git a/Boards/LilygoTdeck/Source/hal/TdeckSdCard.cpp b/Boards/LilygoTdeck/Source/hal/TdeckSdCard.cpp
index ff3eae97..486d3d13 100644
--- a/Boards/LilygoTdeck/Source/hal/TdeckSdCard.cpp
+++ b/Boards/LilygoTdeck/Source/hal/TdeckSdCard.cpp
@@ -18,7 +18,7 @@ std::shared_ptr<SdCardDevice> createTdeckSdCard() {
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         SdCardDevice::MountBehaviour::AtBoot,
-        tt::lvgl::getLvglSyncLock(),
+        tt::lvgl::getSyncLock(),
         {
             TDECK_RADIO_PIN_CS,
             TDECK_LCD_PIN_CS
diff --git a/Boards/M5stackCore2/Source/M5stackCore2.cpp b/Boards/M5stackCore2/Source/M5stackCore2.cpp
index 1cdd901a..b49330c9 100644
--- a/Boards/M5stackCore2/Source/M5stackCore2.cpp
+++ b/Boards/M5stackCore2/Source/M5stackCore2.cpp
@@ -75,7 +75,7 @@ extern const tt::hal::Configuration m5stack_core2 = {
             .initMode = tt::hal::spi::InitMode::ByTactility,
             .canReinit = false,
             .hasMutableConfiguration = false,
-            .lock = tt::lvgl::getLvglSyncLock() // esp_lvgl_port owns the lock for the display
+            .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
         }
     }
 };
diff --git a/Boards/M5stackCore2/Source/hal/Core2SdCard.cpp b/Boards/M5stackCore2/Source/hal/Core2SdCard.cpp
index 85c6f262..59893496 100644
--- a/Boards/M5stackCore2/Source/hal/Core2SdCard.cpp
+++ b/Boards/M5stackCore2/Source/hal/Core2SdCard.cpp
@@ -17,7 +17,7 @@ std::shared_ptr<SdCardDevice> createSdCard() {
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         SdCardDevice::MountBehaviour::AtBoot,
-        tt::lvgl::getLvglSyncLock(),
+        tt::lvgl::getSyncLock(),
         {
             CORE2_LCD_PIN_CS
         }
diff --git a/Boards/M5stackCoreS3/Source/M5stackCoreS3.cpp b/Boards/M5stackCoreS3/Source/M5stackCoreS3.cpp
index 2335fe38..e3301a6d 100644
--- a/Boards/M5stackCoreS3/Source/M5stackCoreS3.cpp
+++ b/Boards/M5stackCoreS3/Source/M5stackCoreS3.cpp
@@ -74,7 +74,7 @@ const tt::hal::Configuration m5stack_cores3 = {
             .initMode = tt::hal::spi::InitMode::ByTactility,
             .canReinit = false,
             .hasMutableConfiguration = false,
-            .lock = tt::lvgl::getLvglSyncLock() // esp_lvgl_port owns the lock for the display
+            .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
         }
     }
 };
diff --git a/Boards/M5stackCoreS3/Source/hal/CoreS3SdCard.cpp b/Boards/M5stackCoreS3/Source/hal/CoreS3SdCard.cpp
index 805ebcb1..b2bb087a 100644
--- a/Boards/M5stackCoreS3/Source/hal/CoreS3SdCard.cpp
+++ b/Boards/M5stackCoreS3/Source/hal/CoreS3SdCard.cpp
@@ -17,7 +17,7 @@ std::shared_ptr<SdCardDevice> createSdCard() {
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         SdCardDevice::MountBehaviour::AtBoot,
-        tt::lvgl::getLvglSyncLock(),
+        tt::lvgl::getSyncLock(),
         {
             CORES3_LCD_PIN_CS
         },
diff --git a/Boards/UnPhone/Source/UnPhone.cpp b/Boards/UnPhone/Source/UnPhone.cpp
index 70797742..11dcfbff 100644
--- a/Boards/UnPhone/Source/UnPhone.cpp
+++ b/Boards/UnPhone/Source/UnPhone.cpp
@@ -76,7 +76,7 @@ extern const tt::hal::Configuration unPhone = {
             .initMode = tt::hal::spi::InitMode::ByTactility,
             .canReinit = false,
             .hasMutableConfiguration = false,
-            .lock = tt::lvgl::getLvglSyncLock() // esp_lvgl_port owns the lock for the display
+            .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
         }
     }
 };
diff --git a/Boards/UnPhone/Source/hal/UnPhoneSdCard.cpp b/Boards/UnPhone/Source/hal/UnPhoneSdCard.cpp
index 2cab6436..d3595ad8 100644
--- a/Boards/UnPhone/Source/hal/UnPhoneSdCard.cpp
+++ b/Boards/UnPhone/Source/hal/UnPhoneSdCard.cpp
@@ -19,7 +19,7 @@ std::shared_ptr<SdCardDevice> createUnPhoneSdCard() {
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         SdCardDevice::MountBehaviour::AtBoot,
-        tt::lvgl::getLvglSyncLock(),
+        tt::lvgl::getSyncLock(),
         {
             UNPHONE_LORA_PIN_CS,
             UNPHONE_LCD_PIN_CS,
diff --git a/Tactility/Include/Tactility/lvgl/LvglSync.h b/Tactility/Include/Tactility/lvgl/LvglSync.h
index 4c6895d8..5f4209cc 100644
--- a/Tactility/Include/Tactility/lvgl/LvglSync.h
+++ b/Tactility/Include/Tactility/lvgl/LvglSync.h
@@ -25,6 +25,6 @@ void syncSet(LvglLock lock, LvglUnlock unlock);
 bool lock(TickType_t timeout);
 void unlock();
 
-std::shared_ptr<Lock> getLvglSyncLock();
+std::shared_ptr<Lock> getSyncLock();
 
 } // namespace
diff --git a/Tactility/Source/app/files/View.cpp b/Tactility/Source/app/files/View.cpp
index e97b0f75..d6447486 100644
--- a/Tactility/Source/app/files/View.cpp
+++ b/Tactility/Source/app/files/View.cpp
@@ -228,7 +228,7 @@ void View::showActionsForFile() {
 }
 
 void View::update() {
-    auto scoped_lockable = lvgl::getLvglSyncLock()->scoped();
+    auto scoped_lockable = lvgl::getSyncLock()->scoped();
     if (scoped_lockable->lock(100 / portTICK_PERIOD_MS)) {
         lv_obj_clean(dir_entry_list);
 
@@ -277,14 +277,14 @@ void View::init(lv_obj_t* parent) {
 }
 
 void View::onDirEntryListScrollBegin() {
-    auto scoped_lockable = lvgl::getLvglSyncLock()->scoped();
+    auto scoped_lockable = lvgl::getSyncLock()->scoped();
     if (scoped_lockable->lock(100 / portTICK_PERIOD_MS)) {
         lv_obj_add_flag(action_list, LV_OBJ_FLAG_HIDDEN);
     }
 }
 
 void View::onNavigate() {
-    auto scoped_lockable = lvgl::getLvglSyncLock()->scoped();
+    auto scoped_lockable = lvgl::getSyncLock()->scoped();
     if (scoped_lockable->lock(100 / portTICK_PERIOD_MS)) {
         lv_obj_add_flag(action_list, LV_OBJ_FLAG_HIDDEN);
     }
diff --git a/Tactility/Source/app/gpio/Gpio.cpp b/Tactility/Source/app/gpio/Gpio.cpp
index 2d08f60b..7acbb549 100644
--- a/Tactility/Source/app/gpio/Gpio.cpp
+++ b/Tactility/Source/app/gpio/Gpio.cpp
@@ -49,7 +49,7 @@ void GpioApp::updatePinStates() {
 }
 
 void GpioApp::updatePinWidgets() {
-    auto scoped_lvgl_lock = lvgl::getLvglSyncLock()->scoped();
+    auto scoped_lvgl_lock = lvgl::getSyncLock()->scoped();
     auto scoped_gpio_lock = mutex.asScopedLock();
     if (scoped_gpio_lock.lock() && scoped_lvgl_lock->lock(100)) {
         for (int j = 0; j < GPIO_NUM_MAX; ++j) {
diff --git a/Tactility/Source/app/screenshot/Screenshot.cpp b/Tactility/Source/app/screenshot/Screenshot.cpp
index 29ac2c6d..e05407bb 100644
--- a/Tactility/Source/app/screenshot/Screenshot.cpp
+++ b/Tactility/Source/app/screenshot/Screenshot.cpp
@@ -90,7 +90,7 @@ ScreenshotApp::~ScreenshotApp() {
 }
 
 void ScreenshotApp::onTimerTick() {
-    auto lvgl_lock = lvgl::getLvglSyncLock()->scoped();
+    auto lvgl_lock = lvgl::getSyncLock()->scoped();
     if (lvgl_lock->lock(50 / portTICK_PERIOD_MS)) {
         updateScreenshotMode();
     }
diff --git a/Tactility/Source/lvgl/LvglSync.cpp b/Tactility/Source/lvgl/LvglSync.cpp
index 62327b74..b7eaee11 100644
--- a/Tactility/Source/lvgl/LvglSync.cpp
+++ b/Tactility/Source/lvgl/LvglSync.cpp
@@ -52,7 +52,7 @@ public:
 
 static std::shared_ptr<Lock> lvglSync = std::make_shared<LvglSync>();
 
-std::shared_ptr<Lock> getLvglSyncLock() {
+std::shared_ptr<Lock> getSyncLock() {
     return lvglSync;
 }