diff --git a/apps/home/controller.cpp b/apps/home/controller.cpp
index 0873aadd8..a68183025 100644
--- a/apps/home/controller.cpp
+++ b/apps/home/controller.cpp
@@ -12,7 +12,7 @@ Controller::ContentView::ContentView(Controller * controller, SelectableTableVie
   m_selectableTableView.setVerticalCellOverlap(0);
   m_selectableTableView.setMargins(0, k_sideMargin, k_bottomMargin, k_sideMargin);
   m_selectableTableView.setColorsBackground(false);
-  m_selectableTableView.decorator()->setIndicatorThickness(k_indicatorThickness);
+  m_selectableTableView.decorator()->setBarsFrameBreadth(k_scrollBarsFrameBreadth);
   m_selectableTableView.decorator()->verticalBar()->setMargin(k_indicatorMargin);
 }
 
diff --git a/apps/home/controller.h b/apps/home/controller.h
index 183dbda07..679651b1a 100644
--- a/apps/home/controller.h
+++ b/apps/home/controller.h
@@ -43,7 +43,7 @@ private:
   AppsContainer * m_container;
   static constexpr KDCoordinate k_sideMargin = 4;
   static constexpr KDCoordinate k_bottomMargin = 14;
-  static constexpr KDCoordinate k_indicatorThickness = 15;
+  static constexpr KDCoordinate k_scrollBarsFrameBreadth = 15;
   static constexpr KDCoordinate k_indicatorMargin = 61;
   static constexpr int k_numberOfColumns = 3;
   static constexpr int k_maxNumberOfCells = 16;
diff --git a/apps/shared/storage_values_controller.cpp b/apps/shared/storage_values_controller.cpp
index d72e856c1..e9b12b3dc 100644
--- a/apps/shared/storage_values_controller.cpp
+++ b/apps/shared/storage_values_controller.cpp
@@ -32,7 +32,7 @@ StorageValuesController::StorageValuesController(Responder * parentResponder, In
   m_selectableTableView.setBottomMargin(k_bottomMargin);
   m_selectableTableView.setLeftMargin(k_leftMargin);
   m_selectableTableView.setBackgroundColor(Palette::WallScreenDark);
-  m_selectableTableView.decorator()->setIndicatorThickness(13);
+  m_selectableTableView.decorator()->setBarsFrameBreadth(13);
   m_abscissaTitleCell.setMessageFont(k_font);
   for (int i = 0; i < k_maxNumberOfAbscissaCells; i++) {
     m_abscissaCells[i].setParentResponder(&m_selectableTableView);
diff --git a/apps/shared/values_controller.cpp b/apps/shared/values_controller.cpp
index 3c7f49ab2..a6d893ae5 100644
--- a/apps/shared/values_controller.cpp
+++ b/apps/shared/values_controller.cpp
@@ -32,7 +32,7 @@ ValuesController::ValuesController(Responder * parentResponder, InputEventHandle
   m_selectableTableView.setBottomMargin(k_bottomMargin);
   m_selectableTableView.setLeftMargin(k_leftMargin);
   m_selectableTableView.setBackgroundColor(Palette::WallScreenDark);
-  m_selectableTableView.decorator()->setIndicatorThickness(13);
+  m_selectableTableView.decorator()->setBarsFrameBreadth(13);
   m_abscissaTitleCell.setMessageFont(KDFont::SmallFont);
   for (int i = 0; i < k_maxNumberOfAbscissaCells; i++) {
     m_abscissaCells[i].setParentResponder(&m_selectableTableView);
diff --git a/escher/include/escher/scroll_view.h b/escher/include/escher/scroll_view.h
index 2a5b2c1aa..d47408f71 100644
--- a/escher/include/escher/scroll_view.h
+++ b/escher/include/escher/scroll_view.h
@@ -36,11 +36,11 @@ public:
     void layoutIndicators(KDSize content, KDPoint offset, KDSize frame);
     ScrollViewVerticalBar * verticalBar() { return &m_verticalBar; }
     ScrollViewHorizontalBar * horizontalBar() { return &m_horizontalBar; }
-    void setIndicatorThickness(KDCoordinate t) { m_indicatorThickness = t; }
+    void setBarsFrameBreadth(KDCoordinate t) { m_barsFrameBreadth = t; }
   private:
     ScrollViewVerticalBar m_verticalBar;
     ScrollViewHorizontalBar m_horizontalBar;
-    KDCoordinate m_indicatorThickness;
+    KDCoordinate m_barsFrameBreadth;
   };
 
   Decorator * decorator() { return &m_decorator; }
diff --git a/escher/src/scroll_view.cpp b/escher/src/scroll_view.cpp
index c4cbd15cc..caa271a3d 100644
--- a/escher/src/scroll_view.cpp
+++ b/escher/src/scroll_view.cpp
@@ -148,17 +148,17 @@ KDCoordinate ScrollView::maxContentHeightDisplayableWithoutScrolling() {
 ScrollView::Decorator::Decorator() :
   m_verticalBar(),
   m_horizontalBar(),
-  m_indicatorThickness(20)
+  m_barsFrameBreadth(20)
 {
 }
 
 void ScrollView::Decorator::layoutIndicators(KDSize content, KDPoint offset, KDSize frame) {
-  KDCoordinate hBarFrameBreadth = m_indicatorThickness * m_horizontalBar.update(
+  KDCoordinate hBarFrameBreadth = m_barsFrameBreadth * m_horizontalBar.update(
     content.width(),
     offset.x(),
     frame.width()
   );
-  KDCoordinate vBarFrameBreadth = m_indicatorThickness * m_verticalBar.update(
+  KDCoordinate vBarFrameBreadth = m_barsFrameBreadth * m_verticalBar.update(
     content.height(),
     offset.y(),
     frame.height()