5 files changed, 7 insertions, 7 deletions

diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c
index 75c0612292..09d861245a 100644
--- a/apps/gui/color_picker.c
+++ b/apps/gui/color_picker.c
@@ -177,7 +177,7 @@ static void draw_screen(struct screen *display, char *title,
 
     /* Draw title string */
     set_drawinfo(display, DRMODE_SOLID, text_color, background_color);
-    vp.flags |= VP_FLAG_CENTER_ALIGN;
+    vp.flags |= VP_FLAG_ALIGN_CENTER;
     display->getstringsize(title, NULL, &y);
     display->putsxy(0, MARGIN_TOP, title);
 
@@ -257,7 +257,7 @@ static void draw_screen(struct screen *display, char *title,
         display->putsxy(text_x, text_top, buf);
         /* Draw color value */
         snprintf(buf, 3, "%02d", rgb->rgb_val[i]);
-        vp.flags |= VP_FLAG_IS_RTL;
+        vp.flags |= VP_FLAG_ALIGN_RIGHT;
         display->putsxy(text_x, text_top, buf);
 
         /* Draw scrollbar */
@@ -278,7 +278,7 @@ static void draw_screen(struct screen *display, char *title,
     /* Format RGB: #rrggbb */
     snprintf(buf, sizeof(buf), str(LANG_COLOR_RGB_VALUE),
                                rgb->red, rgb->green, rgb->blue);
-    vp.flags |= VP_FLAG_CENTER_ALIGN;
+    vp.flags |= VP_FLAG_ALIGN_CENTER;
     if (display->depth >= 16)
     {
         /* Display color swatch on color screens only */
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index e7c9f4fb52..bd6199c5e9 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -706,7 +706,7 @@ static int parse_viewport(const char *wps_bufptr,
     if (!(ptr = viewport_parse_viewport(vp, screen, ptr, '|')))
         return WPS_ERROR_INVALID_PARAM;
 
-    vp->flags &= ~VP_FLAG_IS_RTL; /* ignore rright-to-left languages */
+    vp->flags &= ~VP_FLAG_ALIGN_RIGHT; /* ignore right-to-left languages */
     /* Check for trailing | */
     if (*ptr != '|')
         return WPS_ERROR_INVALID_PARAM;
diff --git a/apps/gui/splash.c b/apps/gui/splash.c
index aaa259c09d..4ddd22aba2 100644
--- a/apps/gui/splash.c
+++ b/apps/gui/splash.c
@@ -147,7 +147,7 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
     if (vp.height > screen->lcdheight)
         vp.height = screen->lcdheight;
 
-    vp.flags |=  VP_FLAG_CENTER_ALIGN;
+    vp.flags |=  VP_FLAG_ALIGN_CENTER;
 #if LCD_DEPTH > 1
     if (screen->depth > 1)
     {
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index 8275165178..5aac200157 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -175,7 +175,7 @@ static void gui_statusbar_init(struct gui_statusbar * bar)
 
 #define GET_RECT(vp, vals,display)      do {                        \
         viewport_set_fullscreen(&(vp), (display)->screen_type);     \
-        (vp).flags &= ~VP_FLAG_IS_RTL;                              \
+        (vp).flags &= ~VP_FLAG_ALIGN_RIGHT;                              \
         (vp).height = STATUSBAR_HEIGHT;                             \
         (vp).x = STATUSBAR_X_POS;                                   \
         if ((vals) != STATUSBAR_BOTTOM)                             \
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index d5f45b3382..fdd06bdc46 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -369,7 +369,7 @@ static void set_default_align_flags(struct viewport *vp)
     vp->flags &= ~VP_FLAG_ALIGNMENT_MASK;
 #ifndef __PCTOOL__
     if (UNLIKELY(lang_is_rtl()))
-        vp->flags |= VP_FLAG_IS_RTL;
+        vp->flags |= VP_FLAG_ALIGN_RIGHT;
 #endif
 }