diff --git a/Boards/LilygoTLoraPager/Source/LilygoTloraPager.cpp b/Boards/LilygoTLoraPager/Source/LilygoTloraPager.cpp
index 3f52b162..f37e054c 100644
--- a/Boards/LilygoTLoraPager/Source/LilygoTloraPager.cpp
+++ b/Boards/LilygoTLoraPager/Source/LilygoTloraPager.cpp
@@ -7,7 +7,7 @@
 
 #include <Tactility/hal/Configuration.h>
 
-#define TDECK_SPI_TRANSFER_SIZE_LIMIT (TDECK_LCD_HORIZONTAL_RESOLUTION * TDECK_LCD_SPI_TRANSFER_HEIGHT * (LV_COLOR_DEPTH / 8))
+#define TPAGER_SPI_TRANSFER_SIZE_LIMIT (TPAGER_LCD_HORIZONTAL_RESOLUTION * TPAGER_LCD_SPI_TRANSFER_HEIGHT * (LV_COLOR_DEPTH / 8))
 
 bool tpagerInit();
 
@@ -21,7 +21,7 @@ extern const Configuration lilygo_tlora_pager = {
     .power = tpager_get_power,
     .i2c = {
         i2c::Configuration {
-            .name = "Internal",
+            .name = "Shared",
             .port = I2C_NUM_0,
             .initMode = i2c::InitMode::ByTactility,
             .isMutable = true,
@@ -49,7 +49,7 @@ extern const Configuration lilygo_tlora_pager = {
                    .data6_io_num = GPIO_NUM_NC,
                    .data7_io_num = GPIO_NUM_NC,
                    .data_io_default_level = false,
-                   .max_transfer_sz = TDECK_SPI_TRANSFER_SIZE_LIMIT,
+                   .max_transfer_sz = TPAGER_SPI_TRANSFER_SIZE_LIMIT,
                    .flags = 0,
                    .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
                    .intr_flags = 0},
@@ -57,8 +57,27 @@ extern const Configuration lilygo_tlora_pager = {
         .isMutable = false,
         .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
     }},
-    .uart {uart::Configuration {.name = "Grove", .port = UART_NUM_1, .rxPin = GPIO_NUM_4, .txPin = GPIO_NUM_12, .rtsPin = GPIO_NUM_NC, .ctsPin = GPIO_NUM_NC, .rxBufferSize = 1024, .txBufferSize = 1024, .config = {.baud_rate = 38400, .data_bits = UART_DATA_8_BITS, .parity = UART_PARITY_DISABLE, .stop_bits = UART_STOP_BITS_1, .flow_ctrl = UART_HW_FLOWCTRL_DISABLE, .rx_flow_ctrl_thresh = 0, .source_clk = UART_SCLK_DEFAULT, .flags = {
-                                                                                                                                                                                                                                                                                                                                                                                                                                            .allow_pd = 0,
-                                                                                                                                                                                                                                                                                                                                                                                                                                            .backup_before_sleep = 0,
-                                                                                                                                                                                                                                                                                                                                                                                                                                        }}}}
+    .uart {uart::Configuration {
+        .name = "Grove",
+        .port = UART_NUM_1,
+        .rxPin = GPIO_NUM_4,
+        .txPin = GPIO_NUM_12,
+        .rtsPin = GPIO_NUM_NC,
+        .ctsPin = GPIO_NUM_NC,
+        .rxBufferSize = 1024,
+        .txBufferSize = 1024,
+        .config = {
+            .baud_rate = 38400,
+            .data_bits = UART_DATA_8_BITS,
+            .parity = UART_PARITY_DISABLE,
+            .stop_bits = UART_STOP_BITS_1,
+            .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
+            .rx_flow_ctrl_thresh = 0,
+            .source_clk = UART_SCLK_DEFAULT,
+            .flags = {
+                .allow_pd = 0,
+                .backup_before_sleep = 0,
+            }
+        }
+    }}
 };
diff --git a/Boards/LilygoTLoraPager/Source/hal/TpagerDisplay.cpp b/Boards/LilygoTLoraPager/Source/hal/TpagerDisplay.cpp
index d4ac7a06..30dceb9a 100644
--- a/Boards/LilygoTLoraPager/Source/hal/TpagerDisplay.cpp
+++ b/Boards/LilygoTLoraPager/Source/hal/TpagerDisplay.cpp
@@ -6,13 +6,13 @@
 
 #include <driver/spi_master.h>
 
-#define TAG "tdeck_display"
+#define TAG "TPAGER_display"
 
 std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
     auto configuration = std::make_unique<St7796Display::Configuration>(
-        TDECK_LCD_SPI_HOST,
-        TDECK_LCD_PIN_CS,
-        TDECK_LCD_PIN_DC,
+        TPAGER_LCD_SPI_HOST,
+        TPAGER_LCD_PIN_CS,
+        TPAGER_LCD_PIN_DC,
         480, // w
         222, // h
         nullptr,
diff --git a/Boards/LilygoTLoraPager/Source/hal/TpagerDisplayConstants.h b/Boards/LilygoTLoraPager/Source/hal/TpagerDisplayConstants.h
index c2d379a8..98847e46 100644
--- a/Boards/LilygoTLoraPager/Source/hal/TpagerDisplayConstants.h
+++ b/Boards/LilygoTLoraPager/Source/hal/TpagerDisplayConstants.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#define TDECK_LCD_SPI_HOST SPI2_HOST
-#define TDECK_LCD_PIN_CS GPIO_NUM_38
-#define TDECK_LCD_PIN_DC GPIO_NUM_37 // RS
-#define TDECK_LCD_HORIZONTAL_RESOLUTION 222
-#define TDECK_LCD_VERTICAL_RESOLUTION 480
-#define TDECK_LCD_SPI_TRANSFER_HEIGHT (TDECK_LCD_VERTICAL_RESOLUTION / 10)
+#define TPAGER_LCD_SPI_HOST SPI2_HOST
+#define TPAGER_LCD_PIN_CS GPIO_NUM_38
+#define TPAGER_LCD_PIN_DC GPIO_NUM_37 // RS
+#define TPAGER_LCD_HORIZONTAL_RESOLUTION 222
+#define TPAGER_LCD_VERTICAL_RESOLUTION 480
+#define TPAGER_LCD_SPI_TRANSFER_HEIGHT (TPAGER_LCD_VERTICAL_RESOLUTION / 10)
diff --git a/Boards/LilygoTLoraPager/Source/hal/TpagerSdCard.cpp b/Boards/LilygoTLoraPager/Source/hal/TpagerSdCard.cpp
index 54593414..38340ec2 100644
--- a/Boards/LilygoTLoraPager/Source/hal/TpagerSdCard.cpp
+++ b/Boards/LilygoTLoraPager/Source/hal/TpagerSdCard.cpp
@@ -7,20 +7,20 @@
 
 using tt::hal::sdcard::SpiSdCardDevice;
 
-#define TDECK_SDCARD_PIN_CS GPIO_NUM_21
-#define TDECK_LCD_PIN_CS GPIO_NUM_38
-#define TDECK_RADIO_PIN_CS GPIO_NUM_36
+#define TPAGER_SDCARD_PIN_CS GPIO_NUM_21
+#define TPAGER_LCD_PIN_CS GPIO_NUM_38
+#define TPAGER_RADIO_PIN_CS GPIO_NUM_36
 
 std::shared_ptr<SdCardDevice> createTpagerSdCard() {
     auto* configuration = new SpiSdCardDevice::Config(
-        TDECK_SDCARD_PIN_CS,
+        TPAGER_SDCARD_PIN_CS,
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         SdCardDevice::MountBehaviour::AtBoot,
         tt::lvgl::getSyncLock(),
-        {TDECK_RADIO_PIN_CS,
-         TDECK_LCD_PIN_CS}
+        {TPAGER_RADIO_PIN_CS,
+         TPAGER_LCD_PIN_CS}
     );
 
     auto* sdcard = (SdCardDevice*)new SpiSdCardDevice(