diff --git a/radio/src/gui/9X/lcd.cpp b/radio/src/gui/9X/lcd.cpp
index 62a51d625..c4b48fc24 100644
--- a/radio/src/gui/9X/lcd.cpp
+++ b/radio/src/gui/9X/lcd.cpp
@@ -459,14 +459,14 @@ void lcd_outdezNAtt(coord_t x, coord_t y, lcdint_t val, LcdFlags flags, uint8_t
         x -= 2;
         lcdDrawPoint(x+1, y+5);
         if ((flags&INVERS) && ((~flags & BLINK) || BLINK_ON_PHASE)) {
-          lcd_vline(x+1, y, 7);
+          lcdDrawSolidVerticalLine(x+1, y, 7);
         }
       }
       else if (tinsize) {
         x--;
         lcdDrawPoint(x-1, y+4);
         if ((flags&INVERS) && ((~flags & BLINK) || BLINK_ON_PHASE)) {
-          lcd_vline(x-1, y-1, 7);
+          lcdDrawSolidVerticalLine(x-1, y-1, 7);
         }
         x--;
       }
@@ -486,15 +486,15 @@ void lcd_outdezNAtt(coord_t x, coord_t y, lcdint_t val, LcdFlags flags, uint8_t
   if (xn) {
     if (midsize) {
       if ((flags&INVERS) && ((~flags & BLINK) || BLINK_ON_PHASE)) {
-        lcd_vline(xn, y, 12);
-        lcd_vline(xn+1, y, 12);
+        lcdDrawSolidVerticalLine(xn, y, 12);
+        lcdDrawSolidVerticalLine(xn+1, y, 12);
       }
       lcdDrawSolidHorizontalLine(xn, y+9, 2);
       lcdDrawSolidHorizontalLine(xn, y+10, 2);
     }
     else {
       // TODO needed on CPUAVR? y &= ~0x07;
-      drawFilledRect(xn, y+2*FH-3, ln, 2);
+      lcdDrawFilledRect(xn, y+2*FH-3, ln, 2);
     }
   }
   if (neg) lcdDrawChar(x, y, '-', flags);
@@ -551,7 +551,7 @@ void lcdDrawLine(coord_t x1, coord_t y1, coord_t x2, coord_t y2, uint8_t pat, Lc
 }
 #endif
 
-void lcd_vline(coord_t x, scoord_t y, scoord_t h)
+void lcdDrawSolidVerticalLine(coord_t x, scoord_t y, scoord_t h)
 {
   lcdDrawVerticalLine(x, y, h, SOLID);
 }
@@ -566,7 +566,7 @@ void lcdDrawRect(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t pat, LcdFla
 }
 
 #if !defined(BOOT)
-void drawFilledRect(coord_t x, scoord_t y, coord_t w, coord_t h, uint8_t pat, LcdFlags att)
+void lcdDrawFilledRect(coord_t x, scoord_t y, coord_t w, coord_t h, uint8_t pat, LcdFlags att)
 {
 #if defined(CPUM64)
   for (scoord_t i=y; i<y+h; i++) {
@@ -820,14 +820,14 @@ void displayGpsCoord(coord_t x, coord_t y, char direction, int16_t bp, int16_t a
     uint8_t mn = bp % 100; // TODO div_t
     if (g_eeGeneral.gpsFormat == 0) {
       lcd_outdezNAtt(lcdNextPos, y, mn, att|LEFT|LEADING0, 2); // mm before '.'
-      lcd_vline(lcdLastPos, y, 2);
+      lcdDrawSolidVerticalLine(lcdLastPos, y, 2);
       if (seconds) {
         uint16_t ss = ap * 6 / 10;
         lcd_outdezNAtt(lcdLastPos+3, y, ss / 100, att|LEFT|LEADING0, 2); // ''
         lcdDrawPoint(lcdLastPos, y+FH-2, 0); // small decimal point
         lcd_outdezNAtt(lcdLastPos+2, y, ss % 100, att|LEFT|LEADING0, 2); // ''
-        lcd_vline(lcdLastPos, y, 2);
-        lcd_vline(lcdLastPos+2, y, 2);
+        lcdDrawSolidVerticalLine(lcdLastPos, y, 2);
+        lcdDrawSolidVerticalLine(lcdLastPos+2, y, 2);
       }
       lcd_putc(lcdLastPos+2, y, direction);
     }
diff --git a/radio/src/gui/9X/lcd.h b/radio/src/gui/9X/lcd.h
index 4ca35049a..c6a07e798 100644
--- a/radio/src/gui/9X/lcd.h
+++ b/radio/src/gui/9X/lcd.h
@@ -227,7 +227,7 @@ void lcdDrawPoint(coord_t x, coord_t y, LcdFlags att=0);
 void lcdMaskPoint(uint8_t *p, uint8_t mask, LcdFlags att=0);
 void lcdDrawSolidHorizontalLine(coord_t x, coord_t y, coord_t w, LcdFlags att=0);
 void lcdDrawHorizontalLine(coord_t x, coord_t y, coord_t w, uint8_t pat, LcdFlags att=0);
-void lcd_vline(coord_t x, scoord_t y, scoord_t h);
+void lcdDrawSolidVerticalLine(coord_t x, scoord_t y, scoord_t h);
 #if defined(CPUM64)
   void lcdDrawVerticalLine(coord_t x, scoord_t y, int8_t h, uint8_t pat);
 #else
@@ -238,7 +238,7 @@ void lcd_vline(coord_t x, scoord_t y, scoord_t h);
   void lcdDrawLine(coord_t x1, coord_t y1, coord_t x2, coord_t y2, uint8_t pat=SOLID, LcdFlags att=0);
 #endif
 
-void drawFilledRect(coord_t x, scoord_t y, coord_t w, coord_t h, uint8_t pat=SOLID, LcdFlags att=0);
+void lcdDrawFilledRect(coord_t x, scoord_t y, coord_t w, coord_t h, uint8_t pat=SOLID, LcdFlags att=0);
 void lcdDrawRect(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t pat=SOLID, LcdFlags att=0);
 
 void lcdInvertLine(int8_t line);
@@ -248,9 +248,9 @@ inline void lcdDrawSquare(coord_t x, coord_t y, coord_t w, LcdFlags att=0) { lcd
 void lcdDrawTelemetryTopBar();
 
 #define V_BAR(xx, yy, ll)    \
-  lcd_vline(xx-1,yy-ll,ll);  \
-  lcd_vline(xx  ,yy-ll,ll);  \
-  lcd_vline(xx+1,yy-ll,ll)
+  lcdDrawSolidVerticalLine(xx-1,yy-ll,ll);  \
+  lcdDrawSolidVerticalLine(xx  ,yy-ll,ll);  \
+  lcdDrawSolidVerticalLine(xx+1,yy-ll,ll)
 
 void lcd_img(coord_t x, coord_t y, const pm_uchar * img, uint8_t idx, LcdFlags att=0);
 
diff --git a/radio/src/gui/9X/menu_general_setup.cpp b/radio/src/gui/9X/menu_general_setup.cpp
index 4cc575869..a8bb70d40 100644
--- a/radio/src/gui/9X/menu_general_setup.cpp
+++ b/radio/src/gui/9X/menu_general_setup.cpp
@@ -557,7 +557,7 @@ void menuGeneralSetup(uint8_t event)
           lcd_img((6+4*i)*FW, y, sticks, i, 0);
 #if defined(FRSKY_STICKS)
           if (g_eeGeneral.stickReverse & (1<<i)) {
-            drawFilledRect((6+4*i)*FW, y, 3*FW, FH-1);
+            lcdDrawFilledRect((6+4*i)*FW, y, 3*FW, FH-1);
           }
 #endif
         }
diff --git a/radio/src/gui/9X/menu_model_curves.cpp b/radio/src/gui/9X/menu_model_curves.cpp
index 4fc82d84c..0997aabc5 100644
--- a/radio/src/gui/9X/menu_model_curves.cpp
+++ b/radio/src/gui/9X/menu_model_curves.cpp
@@ -72,7 +72,7 @@ void DrawCurve(uint8_t offset=0)
     point_t point = getPoint(i);
     i++;
     if (point.x == 0) break;
-    drawFilledRect(point.x-offset, point.y-1, 3, 3, SOLID, FORCE); // do markup square
+    lcdDrawFilledRect(point.x-offset, point.y-1, 3, 3, SOLID, FORCE); // do markup square
   } while(1);
 }
 
@@ -199,8 +199,8 @@ void menuModelCurveOne(uint8_t event)
 
     if (s_editMode==1 || !BLINK_ON_PHASE) {
       // do selection square
-      drawFilledRect(point.x-1, point.y-2, 5, 5, SOLID, FORCE);
-      drawFilledRect(point.x, point.y-1, 3, 3, SOLID);
+      lcdDrawFilledRect(point.x-1, point.y-2, 5, 5, SOLID, FORCE);
+      lcdDrawFilledRect(point.x, point.y-1, 3, 3, SOLID);
     }
 
     int8_t x = -100 + 200*i/(crv.points-1);
diff --git a/radio/src/gui/9X/menu_model_inputs_mixes.cpp b/radio/src/gui/9X/menu_model_inputs_mixes.cpp
index 40e7ef6f7..5df8e6e77 100644
--- a/radio/src/gui/9X/menu_model_inputs_mixes.cpp
+++ b/radio/src/gui/9X/menu_model_inputs_mixes.cpp
@@ -97,7 +97,7 @@ void drawFunction(FnFuncP fn, uint8_t offset)
       }
       else {
         uint8_t tmp = (prev_yv < yv ? 0 : 1);
-        lcd_vline(X0+xv-offset-1, yv+tmp, prev_yv-yv);
+        lcdDrawSolidVerticalLine(X0+xv-offset-1, yv+tmp, prev_yv-yv);
       }
     }
     prev_yv = yv;
@@ -383,7 +383,7 @@ void menuModelExpoOne(uint8_t event)
   y512 = (LCD_H-1) - (uint16_t)((y512+RESX)/2) * (LCD_H-1) / RESX;
 #endif
 
-  lcd_vline(x512, y512-3, 3*2+1);
+  lcdDrawSolidVerticalLine(x512, y512-3, 3*2+1);
   lcdDrawSolidHorizontalLine(x512-3, y512, 3*2+1);
 }
 
@@ -437,14 +437,14 @@ void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
     barMax = 101;
   lcdDrawHorizontalLine(x-2, y, GAUGE_WIDTH+2, DOTTED);
   lcdDrawHorizontalLine(x-2, y+GAUGE_HEIGHT, GAUGE_WIDTH+2, DOTTED);
-  lcd_vline(x-2, y+1, GAUGE_HEIGHT-1);
-  lcd_vline(x+GAUGE_WIDTH-1, y+1, GAUGE_HEIGHT-1);
+  lcdDrawSolidVerticalLine(x-2, y+1, GAUGE_HEIGHT-1);
+  lcdDrawSolidVerticalLine(x+GAUGE_WIDTH-1, y+1, GAUGE_HEIGHT-1);
   if (barMin <= barMax) {
     int8_t right = (barMax * GAUGE_WIDTH) / 200;
     int8_t left = ((barMin * GAUGE_WIDTH) / 200)-1;
-    drawFilledRect(x+GAUGE_WIDTH/2+left, y+2, right-left, GAUGE_HEIGHT-3);
+    lcdDrawFilledRect(x+GAUGE_WIDTH/2+left, y+2, right-left, GAUGE_HEIGHT-3);
   }
-  lcd_vline(x+GAUGE_WIDTH/2-1, y, GAUGE_HEIGHT+1);
+  lcdDrawSolidVerticalLine(x+GAUGE_WIDTH/2-1, y, GAUGE_HEIGHT+1);
   if (barMin == -101) {
     for (uint8_t i=0; i<3; ++i) {
       lcdDrawPoint(x+i, y+4-i);
@@ -482,7 +482,7 @@ void menuModelMixOne(uint8_t event)
 #endif
 
 #if MENU_COLUMNS > 1
-  lcd_vline(MENU_COLUMN2_X-4, FH+1, LCD_H-FH-1);
+  lcdDrawSolidVerticalLine(MENU_COLUMN2_X-4, FH+1, LCD_H-FH-1);
 #endif
 
   int8_t sub = m_posVert;
@@ -967,7 +967,7 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
             }
             if (cur == sub) {
               /* invert the raw when it's the current one */
-              drawFilledRect(expo ? EXPO_LINE_SELECT_POS+1 : 23, y, expo ? (LCD_W-EXPO_LINE_SELECT_POS-2) : (LCD_W-24), 7);
+              lcdDrawFilledRect(expo ? EXPO_LINE_SELECT_POS+1 : 23, y, expo ? (LCD_W-EXPO_LINE_SELECT_POS-2) : (LCD_W-24), 7);
             }
           }
         }
diff --git a/radio/src/gui/9X/menu_model_select.cpp b/radio/src/gui/9X/menu_model_select.cpp
index f763de8b2..42ad8fe40 100644
--- a/radio/src/gui/9X/menu_model_select.cpp
+++ b/radio/src/gui/9X/menu_model_select.cpp
@@ -369,7 +369,7 @@ void menuModelSelect(uint8_t event)
     }
 
     if (s_copyMode && (vertpos_t)sub==i+s_pgOfs) {
-      drawFilledRect(9, y, MODELSEL_W-1-9, 7);
+      lcdDrawFilledRect(9, y, MODELSEL_W-1-9, 7);
       lcdDrawRect(8, y-1, MODELSEL_W-1-7, 9, s_copyMode == COPY_MODE ? SOLID : DOTTED);
     }
   }
diff --git a/radio/src/gui/9X/menu_model_setup.cpp b/radio/src/gui/9X/menu_model_setup.cpp
index f720c8db4..ff9a4ed3a 100644
--- a/radio/src/gui/9X/menu_model_setup.cpp
+++ b/radio/src/gui/9X/menu_model_setup.cpp
@@ -669,7 +669,7 @@ void menuModelSetup(uint8_t event)
               }
             }
             else {
-              drawFilledRect(MODEL_SETUP_2ND_COLUMN, y, LCD_W-MODEL_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH, 8);
+              lcdDrawFilledRect(MODEL_SETUP_2ND_COLUMN, y, LCD_W-MODEL_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH, 8);
             }
           }
         }
diff --git a/radio/src/gui/9X/popups.cpp b/radio/src/gui/9X/popups.cpp
index d12f14269..202d54808 100644
--- a/radio/src/gui/9X/popups.cpp
+++ b/radio/src/gui/9X/popups.cpp
@@ -51,7 +51,7 @@ int16_t         s_warning_input_max;
 
 void displayBox()
 {
-  drawFilledRect(10, 16, LCD_W-20, 40, SOLID, ERASE);
+  lcdDrawFilledRect(10, 16, LCD_W-20, 40, SOLID, ERASE);
   lcdDrawRect(10, 16, LCD_W-20, 40);
 #if defined(CPUARM)
   lcd_putsn(WARNING_LINE_X, WARNING_LINE_Y, s_warning, WARNING_LINE_LEN);
@@ -84,7 +84,7 @@ void message(const pm_char *title, const pm_char *t, const char *last MESSAGE_SO
   lcdDrawText(MESSAGE_LCD_OFFSET, 2*FH, STR_WARNING, DBLSIZE);
 #endif
 
-  drawFilledRect(0, 0, LCD_W, 32);
+  lcdDrawFilledRect(0, 0, LCD_W, 32);
   if (t) lcd_putsLeft(5*FH, t);
   if (last) {
     lcd_putsLeft(7*FH, last);
@@ -151,12 +151,12 @@ const char * displayMenu(uint8_t event)
 
   uint8_t display_count = min<uint8_t>(s_menu_count, MENU_MAX_LINES);
   uint8_t y = (display_count >= 5 ? MENU_Y - FH - 1 : MENU_Y);
-  drawFilledRect(MENU_X, y, MENU_W, display_count * (FH+1) + 2, SOLID, ERASE);
+  lcdDrawFilledRect(MENU_X, y, MENU_W, display_count * (FH+1) + 2, SOLID, ERASE);
   lcdDrawRect(MENU_X, y, MENU_W, display_count * (FH+1) + 2);
 
   for (uint8_t i=0; i<display_count; i++) {
     lcdDrawText(MENU_X+6, i*(FH+1) + y + 2, s_menu[i], s_menu_flags);
-    if (i == s_menu_item) drawFilledRect(MENU_X+1, i*(FH+1) + y + 1, MENU_W-2, 9);
+    if (i == s_menu_item) lcdDrawFilledRect(MENU_X+1, i*(FH+1) + y + 1, MENU_W-2, 9);
   }
 
   if (s_menu_count > display_count) {
diff --git a/radio/src/gui/9X/splash.cpp b/radio/src/gui/9X/splash.cpp
index 5d9fc72b7..21d30a366 100644
--- a/radio/src/gui/9X/splash.cpp
+++ b/radio/src/gui/9X/splash.cpp
@@ -50,7 +50,7 @@ void displaySplash()
 
 #if MENUS_LOCK == 1
   if (readonly == false) {
-    drawFilledRect((LCD_W-(sizeof(TR_UNLOCKED)-1)*FW)/2 - 9, 50, (sizeof(TR_UNLOCKED)-1)*FW+16, 11, SOLID, ERASE|ROUND);
+    lcdDrawFilledRect((LCD_W-(sizeof(TR_UNLOCKED)-1)*FW)/2 - 9, 50, (sizeof(TR_UNLOCKED)-1)*FW+16, 11, SOLID, ERASE|ROUND);
     lcd_puts((LCD_W-(sizeof(TR_UNLOCKED)-1)*FW)/2 , 53, STR_UNLOCKED);
   }
 #endif
diff --git a/radio/src/gui/9X/view_main.cpp b/radio/src/gui/9X/view_main.cpp
index a0cacf157..676adfff6 100644
--- a/radio/src/gui/9X/view_main.cpp
+++ b/radio/src/gui/9X/view_main.cpp
@@ -117,14 +117,14 @@ void displayTrims(uint8_t phase)
 
     if (vert[i]) {
       ym = 31;
-      lcd_vline(xm, ym-TRIM_LEN, TRIM_LEN*2);
+      lcdDrawSolidVerticalLine(xm, ym-TRIM_LEN, TRIM_LEN*2);
       if (i!=2 || !g_model.thrTrim) {
-        lcd_vline(xm-1, ym-1,  3);
-        lcd_vline(xm+1, ym-1,  3);
+        lcdDrawSolidVerticalLine(xm-1, ym-1,  3);
+        lcdDrawSolidVerticalLine(xm+1, ym-1,  3);
       }
       ym -= val;
 #if !defined(CPUM64) || !defined(FRSKY)
-      drawFilledRect(xm-3, ym-3, 7, 7, SOLID, att|ERASE);
+      lcdDrawFilledRect(xm-3, ym-3, 7, 7, SOLID, att|ERASE);
       if (dir >= 0) {
         lcdDrawSolidHorizontalLine(xm-1, ym-1,  3);
       }
@@ -150,15 +150,15 @@ void displayTrims(uint8_t phase)
       lcdDrawSolidHorizontalLine(xm-1, ym+1,  3);
       xm += val;
 #if !defined(CPUM64) || !defined(FRSKY)
-      drawFilledRect(xm-3, ym-3, 7, 7, SOLID, att|ERASE);
+      lcdDrawFilledRect(xm-3, ym-3, 7, 7, SOLID, att|ERASE);
       if (dir >= 0) {
-        lcd_vline(xm+1, ym-1,  3);
+        lcdDrawSolidVerticalLine(xm+1, ym-1,  3);
       }
       if (dir <= 0) {
-        lcd_vline(xm-1, ym-1,  3);
+        lcdDrawSolidVerticalLine(xm-1, ym-1,  3);
       }
       if (exttrim) {
-        lcd_vline(xm, ym-1,  3);
+        lcdDrawSolidVerticalLine(xm, ym-1,  3);
       }
 #endif
 #if defined(CPUARM)
@@ -206,13 +206,13 @@ void displayBattVoltage()
 {
 #if defined(BATTGRAPH)
   putsVBat(VBATT_X-8, VBATT_Y+1, 0);
-  drawFilledRect(VBATT_X-25, VBATT_Y+9, 21, 5);
-  lcd_vline(VBATT_X-4, VBATT_Y+10, 3);
+  lcdDrawFilledRect(VBATT_X-25, VBATT_Y+9, 21, 5);
+  lcdDrawSolidVerticalLine(VBATT_X-4, VBATT_Y+10, 3);
   uint8_t count = GET_TXBATT_BARS();
   for (uint8_t i=0; i<count; i+=2)
-    lcd_vline(VBATT_X-24+i, VBATT_Y+10, 3);
+    lcdDrawSolidVerticalLine(VBATT_X-24+i, VBATT_Y+10, 3);
   if (!IS_TXBATT_WARNING() || BLINK_ON_PHASE)
-    drawFilledRect(VBATT_X-26, VBATT_Y, 24, 15);
+    lcdDrawFilledRect(VBATT_X-26, VBATT_Y, 24, 15);
 #else
   LcdFlags att = (IS_TXBATT_WARNING() ? BLINK|INVERS : 0) | BIGSIZE;
   putsVBat(VBATT_X-1, VBATT_Y, att|NO_UNIT);
@@ -492,7 +492,7 @@ void menuMainView(uint8_t event)
 
           if(len>WBAR2)  len = WBAR2;  // prevent bars from going over the end - comment for debugging
           lcdDrawHorizontalLine(x0-WBAR2, y0, WBAR2*2+1, DOTTED);
-          lcd_vline(x0,y0-2,5);
+          lcdDrawSolidVerticalLine(x0,y0-2,5);
           if (val>0)
             x0+=1;
           else
@@ -539,8 +539,8 @@ void menuMainView(uint8_t event)
       for (uint8_t i=0; i<NUM_LOGICAL_SWITCH; i++) {
         int8_t len = getSwitch(SWSRC_SW1+i) ? BAR_HEIGHT : 1;
         uint8_t x = VSWITCH_X(i);
-        lcd_vline(x-1, VSWITCH_Y-len, len);
-        lcd_vline(x,   VSWITCH_Y-len, len);
+        lcdDrawSolidVerticalLine(x-1, VSWITCH_Y-len, len);
+        lcdDrawSolidVerticalLine(x,   VSWITCH_Y-len, len);
       }
 #elif defined(CPUM2560)
       for (uint8_t i=0; i<NUM_LOGICAL_SWITCH; i++)
diff --git a/radio/src/gui/9X/view_statistics.cpp b/radio/src/gui/9X/view_statistics.cpp
index 4e3688652..4ea6dd3a1 100644
--- a/radio/src/gui/9X/view_statistics.cpp
+++ b/radio/src/gui/9X/view_statistics.cpp
@@ -73,13 +73,13 @@ void menuStatisticsView(uint8_t event)
   const coord_t x = 5;
   const coord_t y = 60;
   lcdDrawSolidHorizontalLine(x-3, y, MAXTRACE+3+3);
-  lcd_vline(x, y-32, 32+3);
+  lcdDrawSolidVerticalLine(x, y-32, 32+3);
 
   for (coord_t i=0; i<MAXTRACE; i+=6) {
-    lcd_vline(x+i+6, y-1, 3);
+    lcdDrawSolidVerticalLine(x+i+6, y-1, 3);
   }
   for (coord_t i=1; i<=MAXTRACE; i++) {
-    lcd_vline(x+i, y-s_traceBuf[traceRd], s_traceBuf[traceRd]);
+    lcdDrawSolidVerticalLine(x+i, y-s_traceBuf[traceRd], s_traceBuf[traceRd]);
     traceRd++;
     if (traceRd>=MAXTRACE) traceRd = 0;
     if (traceRd==s_traceWr) break;
diff --git a/radio/src/gui/9X/view_telemetry.cpp b/radio/src/gui/9X/view_telemetry.cpp
index baaa2455d..b8e100392 100644
--- a/radio/src/gui/9X/view_telemetry.cpp
+++ b/radio/src/gui/9X/view_telemetry.cpp
@@ -57,13 +57,13 @@ void displayRssiLine()
     rssi = min((uint8_t)99, frskyData.rssi[1].value);
     lcd_putsLeft(STATUS_BAR_Y, STR_TX); lcd_outdezNAtt(4*FW+1, STATUS_BAR_Y, rssi, LEADING0, 2);
     lcdDrawRect(BAR_LEFT+1, 57, 38, 7);
-    drawFilledRect(BAR_LEFT+1, 58, 4*rssi/11, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID);
+    lcdDrawFilledRect(BAR_LEFT+1, 58, 4*rssi/11, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID);
 #endif
     rssi = min((uint8_t)99, TELEMETRY_RSSI());
     lcd_puts(104, STATUS_BAR_Y, STR_RX); lcd_outdezNAtt(105+4*FW, STATUS_BAR_Y, rssi, LEADING0, 2);
     lcdDrawRect(65, 57, 38, 7);
     uint8_t v = 4*rssi/11;
-    drawFilledRect(66+36-v, 58, v, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID);
+    lcdDrawFilledRect(66+36-v, 58, v, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID);
   }
   else {
     lcdDrawText(7*FW, STATUS_BAR_Y, STR_NODATA, BLINK);
@@ -93,13 +93,13 @@ void displayGpsCoord(uint8_t y, char direction, int16_t bp, int16_t ap)
     if (g_eeGeneral.gpsFormat == 0) {
       lcd_putc(lcdLastPos+FWNUM, y, direction);
       lcd_outdezNAtt(lcdLastPos+FW+FW+1, y, mn, LEFT|LEADING0, 2); // mm before '.'
-      lcd_vline(lcdLastPos, y, 2);
+      lcdDrawSolidVerticalLine(lcdLastPos, y, 2);
       uint16_t ss = ap * 6;
       lcd_outdezNAtt(lcdLastPos+3, y, ss / 1000, LEFT|LEADING0, 2); // ''
       lcdDrawPoint(lcdLastPos, y+FH-2, 0); // small decimal point
       lcd_outdezNAtt(lcdLastPos+2, y, ss % 1000, LEFT|LEADING0, 3); // ''
-      lcd_vline(lcdLastPos, y, 2);
-      lcd_vline(lcdLastPos+2, y, 2);
+      lcdDrawSolidVerticalLine(lcdLastPos, y, 2);
+      lcdDrawSolidVerticalLine(lcdLastPos+2, y, 2);
     }
     else {
       lcd_outdezNAtt(lcdLastPos+FW, y, mn, LEFT|LEADING0, 2); // mm before '.'
@@ -206,7 +206,7 @@ void displayVoltagesScreen()
       lcd_outdezNAtt(LCD_W, y, TELEMETRY_CELL_VOLTAGE(k), attr, 4);
       y += 1*FH;
     }
-    lcd_vline(LCD_W-3*FW-2, 8, 47);
+    lcdDrawSolidVerticalLine(LCD_W-3*FW-2, 8, 47);
   }
 #endif
 
@@ -305,11 +305,11 @@ bool displayGaugesTelemetryScreen(FrSkyScreenData & screen)
       }
 #endif
 
-      drawFilledRect(BAR_LEFT+1, y+1, width, barHeight, barShade);
+      lcdDrawFilledRect(BAR_LEFT+1, y+1, width, barHeight, barShade);
 
       for (uint8_t j=24; j<99; j+=25) {
         if (j>thresholdX || j>width) {
-          lcd_vline(j*BAR_WIDTH/100+BAR_LEFT+1, y+1, barHeight);
+          lcdDrawSolidVerticalLine(j*BAR_WIDTH/100+BAR_LEFT+1, y+1, barHeight);
         }
       }
 
@@ -338,7 +338,7 @@ bool displayNumbersTelemetryScreen(FrSkyScreenData & screen)
         fields_count++;
       }
       if (i==3) {
-        lcd_vline(63, 8, 48);
+        lcdDrawSolidVerticalLine(63, 8, 48);
         if (!TELEMETRY_STREAMING()) {
           displayRssiLine();
           return fields_count;
@@ -388,7 +388,7 @@ bool displayNumbersTelemetryScreen(FrSkyScreenData & screen)
         fields_count++;
       }
       if (i==3) {
-        lcd_vline(63, 8, 48);
+        lcdDrawSolidVerticalLine(63, 8, 48);
         if (TELEMETRY_STREAMING()) {
 #if defined(FRSKY_HUB)
           if (field == TELEM_ACC) {
diff --git a/radio/src/gui/9X/widgets.cpp b/radio/src/gui/9X/widgets.cpp
index bb86e50c4..5fddc8e27 100644
--- a/radio/src/gui/9X/widgets.cpp
+++ b/radio/src/gui/9X/widgets.cpp
@@ -41,7 +41,7 @@ void drawStick(coord_t centrex, int16_t xval, int16_t yval)
 #define BOX_CENTERY   (LCD_H-9-BOX_WIDTH/2)
 #define MARKER_WIDTH  5
   lcdDrawSquare(centrex-BOX_WIDTH/2, BOX_CENTERY-BOX_WIDTH/2, BOX_WIDTH);
-  lcd_vline(centrex, BOX_CENTERY-1, 3);
+  lcdDrawSolidVerticalLine(centrex, BOX_CENTERY-1, 3);
   lcdDrawSolidHorizontalLine(centrex-1, BOX_CENTERY, 3);
   lcdDrawSquare(centrex + (xval/((2*RESX)/(BOX_WIDTH-MARKER_WIDTH))) - MARKER_WIDTH/2, BOX_CENTERY - (yval/((2*RESX)/(BOX_WIDTH-MARKER_WIDTH))) - MARKER_WIDTH/2, MARKER_WIDTH, ROUND);
 #undef BOX_CENTERY
@@ -54,7 +54,7 @@ void menu_lcd_onoff(coord_t x, coord_t y, uint8_t value, LcdFlags attr)
   if (value)
     lcd_putc(x+1, y, '#');
   if (attr)
-    drawFilledRect(x, y, 7, 7);
+    lcdDrawFilledRect(x, y, 7, 7);
   else
     lcdDrawSquare(x, y, 7);
 #else
@@ -119,14 +119,14 @@ void drawSlider(coord_t x, coord_t y, uint8_t value, uint8_t max, uint8_t attr)
 {
   lcd_putc(x+(value*4*FW)/max, y, '$');
   lcdDrawSolidHorizontalLine(x, y+3, 5*FW-1, FORCE);
-  if (attr && (!(attr & BLINK) || !BLINK_ON_PHASE)) drawFilledRect(x, y, 5*FW-1, FH-1);
+  if (attr && (!(attr & BLINK) || !BLINK_ON_PHASE)) lcdDrawFilledRect(x, y, 5*FW-1, FH-1);
 }
 #elif defined(GRAPHICS)
 void display5posSlider(coord_t x, coord_t y, uint8_t value, uint8_t attr)
 {
   lcd_putc(x+2*FW+(value*FW), y, '$');
   lcdDrawSolidHorizontalLine(x, y+3, 5*FW-1, SOLID);
-  if (attr && (!(attr & BLINK) || !BLINK_ON_PHASE)) drawFilledRect(x, y, 5*FW-1, FH-1);
+  if (attr && (!(attr & BLINK) || !BLINK_ON_PHASE)) lcdDrawFilledRect(x, y, 5*FW-1, FH-1);
 }
 #endif
 
@@ -255,9 +255,9 @@ void drawStatusLine()
       statusLineTime = 0;
     }
 
-    drawFilledRect(0, LCD_H-statusLineHeight, LCD_W, FH, SOLID, ERASE);
+    lcdDrawFilledRect(0, LCD_H-statusLineHeight, LCD_W, FH, SOLID, ERASE);
     lcdDrawText(5, LCD_H+1-statusLineHeight, statusLineMsg, BSS);
-    drawFilledRect(0, LCD_H-statusLineHeight, LCD_W, FH, SOLID);
+    lcdDrawFilledRect(0, LCD_H-statusLineHeight, LCD_W, FH, SOLID);
   }
 }
 #endif
diff --git a/radio/src/gui/Horus/menu_model_setup.cpp b/radio/src/gui/Horus/menu_model_setup.cpp
index 57e8952bd..4a21cbea9 100644
--- a/radio/src/gui/Horus/menu_model_setup.cpp
+++ b/radio/src/gui/Horus/menu_model_setup.cpp
@@ -710,7 +710,7 @@ bool menuModelFailsafe(evt_t event)
   #define COL_W   (LCD_W/2)
   const uint8_t SLIDER_W = 64;
   // Column separator
-  // TODO lcd_vline(LCD_W/2, FH, LCD_H-FH);
+  // TODO lcdDrawSolidVerticalLine(LCD_W/2, FH, LCD_H-FH);
 
   if (m_posVert >= 16) {
     ch = 16;
diff --git a/radio/src/gui/Horus/view_telemetry.cpp b/radio/src/gui/Horus/view_telemetry.cpp
index d4ed7eab7..eb2a45df2 100644
--- a/radio/src/gui/Horus/view_telemetry.cpp
+++ b/radio/src/gui/Horus/view_telemetry.cpp
@@ -117,7 +117,7 @@ void displayGaugesTelemetryScreen(FrSkyScreenData & screen)
       lcdDrawSolidFilledRect(GAUGE_MARGIN+GAUGE_PADDING_HORZ+1, y+16, width, 4, TEXT_BGCOLOR);
 /*      for (uint8_t j=24; j<99; j+=25) {
         if (j>thresholdX || j>width) {
-          lcd_vline(j*BAR_WIDTH/100+BAR_LEFT+1, y+1, barHeight);
+          lcdDrawSolidVerticalLine(j*BAR_WIDTH/100+BAR_LEFT+1, y+1, barHeight);
         }
       }
       if (thresholdX) {
diff --git a/radio/src/storage/eeprom_rlc.cpp b/radio/src/storage/eeprom_rlc.cpp
index 6b9c34b24..fdf714483 100644
--- a/radio/src/storage/eeprom_rlc.cpp
+++ b/radio/src/storage/eeprom_rlc.cpp
@@ -867,8 +867,8 @@ void RlcFile::drawProgressBar(uint8_t x)
 {
   if (storageDirtyMsk || isWriting() || eeprom_buffer_size) {
     uint8_t len = storageDirtyMsk ? 1 : limit((uint8_t)1, (uint8_t)(7 - (m_rlc_len/m_ratio)), (uint8_t)7);
-    drawFilledRect(x+1, 0, 5, FH, SOLID, ERASE);
-    drawFilledRect(x+2, 7-len, 3, len);
+    lcdDrawFilledRect(x+1, 0, 5, FH, SOLID, ERASE);
+    lcdDrawFilledRect(x+2, 7-len, 3, len);
   }
 }
 #endif
diff --git a/radio/src/tests/lcd.cpp b/radio/src/tests/lcd.cpp
index 2042de3a6..42a722b9e 100644
--- a/radio/src/tests/lcd.cpp
+++ b/radio/src/tests/lcd.cpp
@@ -194,7 +194,7 @@ TEST(Lcd, vline)
 {
   lcdClear();
   for (int x=0; x<100; x+=2) {
-    lcd_vline(x, x/2, 12);
+    lcdDrawSolidVerticalLine(x, x/2, 12);
   }
   EXPECT_TRUE(checkScreenshot("vline"));
 }
@@ -203,8 +203,8 @@ TEST(Lcd, vline)
 TEST(Lcd, vline_x_lt0)
 {
   lcdClear();
-  lcd_vline(50, -10, 12);
-  lcd_vline(100, -10, 1);
+  lcdDrawSolidVerticalLine(50, -10, 12);
+  lcdDrawSolidVerticalLine(100, -10, 1);
   EXPECT_TRUE(checkScreenshot("vline_lt0"));
 }
 #endif
@@ -215,7 +215,7 @@ TEST(Lcd, Smlsize)
   lcdClear();
   lcdDrawText(0, 0, "TESTgy,", SMLSIZE);
   lcdDrawText(10, 22, "TESTgy,", SMLSIZE|INVERS);
-  drawFilledRect(8, 40, 100, 20);
+  lcdDrawFilledRect(8, 40, 100, 20);
   lcdDrawText(10, 42, "TESTgy,", SMLSIZE);
 
   bool invert = false;
@@ -232,7 +232,7 @@ TEST(Lcd, Stdsize)
   lcdClear();
   lcdDrawText(0, 0, "TEST", 0);
   lcdDrawText(10, 22, "TEST", INVERS);
-  drawFilledRect(8, 40, 100, 20);
+  lcdDrawFilledRect(8, 40, 100, 20);
   lcdDrawText(10, 42, "TEST", 0);
 
   bool invert = false;
@@ -249,7 +249,7 @@ TEST(Lcd, Midsize)
   lcdClear();
   lcdDrawText(0, 0, "TEST", MIDSIZE);
   lcdDrawText(10, 22, "TEST", MIDSIZE|INVERS);
-  drawFilledRect(8, 40, 100, 20);
+  lcdDrawFilledRect(8, 40, 100, 20);
   lcdDrawText(10, 42, "TEST", MIDSIZE);
 
   bool invert = false;
@@ -266,7 +266,7 @@ TEST(Lcd, Dblsize)
   lcdClear();
   lcdDrawText(2, 10, "TST", DBLSIZE);
   lcdDrawText(42, 10, "TST", DBLSIZE|INVERS);
-  drawFilledRect(80, 8, 46, 24);
+  lcdDrawFilledRect(80, 8, 46, 24);
   lcdDrawText(82, 10, "TST", DBLSIZE);
 
   bool invert = false;