diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp
index 2656a49ac..a6ee43db1 100644
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@@ -50,7 +50,7 @@ using namespace Konsole;
 
 ViewContainer::ViewContainer(NavigationPosition position , QObject* parent)
     : QObject(parent)
-    , _navigationDisplayMode(AlwaysShowNavigation)
+    , _navigationVisibility(AlwaysShowNavigation)
     , _navigationPosition(position)
     , _searchBar(0)
 {
@@ -100,10 +100,10 @@ void ViewContainer::moveActiveView(MoveDirection direction)
     setActiveView(_views[newIndex]);
 }
 
-void ViewContainer::setNavigationDisplayMode(NavigationDisplayMode mode)
+void ViewContainer::setNavigationVisibility(NavigationVisibility mode)
 {
-    _navigationDisplayMode = mode;
-    navigationDisplayModeChanged(mode);
+    _navigationVisibility = mode;
+    navigationVisibilityChanged(mode);
 }
 ViewContainer::NavigationPosition ViewContainer::navigationPosition() const
 {
@@ -122,9 +122,9 @@ QList<ViewContainer::NavigationPosition> ViewContainer::supportedNavigationPosit
 {
     return QList<NavigationPosition>() << NavigationPositionTop;
 }
-ViewContainer::NavigationDisplayMode ViewContainer::navigationDisplayMode() const
+ViewContainer::NavigationVisibility ViewContainer::navigationVisibility() const
 {
-    return _navigationDisplayMode;
+    return _navigationVisibility;
 }
 
 void ViewContainer::setNavigationTextMode(bool mode)
@@ -572,7 +572,7 @@ void TabbedViewContainer::navigationPositionChanged(NavigationPosition position)
         _tabBar->setShape(QTabBar::RoundedSouth);
     }
 }
-void TabbedViewContainer::navigationDisplayModeChanged(NavigationDisplayMode mode)
+void TabbedViewContainer::navigationVisibilityChanged(NavigationVisibility mode)
 {
     if (mode == AlwaysShowNavigation && _tabBar->isHidden())
         setTabBarVisible(true);
@@ -753,7 +753,7 @@ void TabbedViewContainer::addViewWidget(QWidget* view , int index)
 
     _tabBar->insertTab(index , item->icon() , item->title());
 
-    if (navigationDisplayMode() == ShowNavigationAsNeeded)
+    if (navigationVisibility() == ShowNavigationAsNeeded)
         dynamicTabBarVisibility();
 }
 void TabbedViewContainer::removeViewWidget(QWidget* view)
@@ -767,7 +767,7 @@ void TabbedViewContainer::removeViewWidget(QWidget* view)
     _stackWidget->removeWidget(view);
     _tabBar->removeTab(index);
 
-    if (navigationDisplayMode() == ShowNavigationAsNeeded)
+    if (navigationVisibility() == ShowNavigationAsNeeded)
         dynamicTabBarVisibility();
 }
 
diff --git a/src/ViewContainer.h b/src/ViewContainer.h
index 33fa336db..5d8537041 100644
--- a/src/ViewContainer.h
+++ b/src/ViewContainer.h
@@ -105,7 +105,7 @@ public:
      * This enum describes the options for showing or hiding the
      * container's navigation widget.
      */
-    enum NavigationDisplayMode {
+    enum NavigationVisibility {
         /** Always show the navigation widget. */
         AlwaysShowNavigation,
         /** Show the navigation widget only when the container has more than one view. */
@@ -121,15 +121,15 @@ public:
      * container.
      *
      * ViewContainer sub-classes should reimplement the
-     * navigationDisplayModeChanged() method to respond to changes
+     * navigationVisibilityChanged() method to respond to changes
      * of this property.
      */
-    void setNavigationDisplayMode(NavigationDisplayMode mode);
+    void setNavigationVisibility(NavigationVisibility mode);
     /**
      * Returns the current mode for controlling the visibility of the
      * the view container's navigation widget.
      */
-    NavigationDisplayMode navigationDisplayMode() const;
+    NavigationVisibility navigationVisibility() const;
 
     /**
      * Sets the position of the navigation widget with
@@ -303,9 +303,9 @@ protected:
 
     /**
      * Called when the navigation display mode changes.
-     * See setNavigationDisplayMode
+     * See setNavigationVisibility
      */
-    virtual void navigationDisplayModeChanged(NavigationDisplayMode) {}
+    virtual void navigationVisibilityChanged(NavigationVisibility) {}
 
     /**
      * Called when the navigation position changes to re-layout
@@ -332,7 +332,7 @@ private slots:
     void searchBarDestroyed();
 
 private:
-    NavigationDisplayMode _navigationDisplayMode;
+    NavigationVisibility _navigationVisibility;
     NavigationPosition _navigationPosition;
     QList<QWidget*> _views;
     QHash<QWidget*, ViewProperties*> _navigation;
@@ -407,7 +407,7 @@ public:
 protected:
     virtual void addViewWidget(QWidget* view , int index);
     virtual void removeViewWidget(QWidget* view);
-    virtual void navigationDisplayModeChanged(NavigationDisplayMode mode);
+    virtual void navigationVisibilityChanged(NavigationVisibility mode);
     virtual void navigationPositionChanged(NavigationPosition position);
     virtual void navigationTextModeChanged(bool mode);
     virtual void moveViewWidget(int fromIndex , int toIndex);
diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
index 12c21562f..d48811bf3 100644
--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@@ -1054,7 +1054,7 @@ void ViewManager::updateNavigationOptions(NavigationOptions options)
     // since we have defined all valid values in konsole.kcfg, we can be sure
     // all these values are safe to be cast into corresponding enum.
     _navigationVisibility =
-        static_cast<ViewContainer::NavigationDisplayMode>(options.visibility);
+        static_cast<ViewContainer::NavigationVisibility>(options.visibility);
     _navigationPosition   =
         static_cast<ViewContainer::NavigationPosition>(options.position);
     _newTabBehavior       =
@@ -1070,7 +1070,7 @@ void ViewManager::updateNavigationOptions(NavigationOptions options)
 void ViewManager::applyNavigationOptions(ViewContainer* container)
 {
 
-    container->setNavigationDisplayMode(_navigationVisibility);
+    container->setNavigationVisibility(_navigationVisibility);
 
     Q_ASSERT( container->supportedNavigationPositions().contains(_navigationPosition) );
     container->setNavigationPosition(_navigationPosition);
diff --git a/src/ViewManager.h b/src/ViewManager.h
index 2bc0e9507..b925d0bfe 100644
--- a/src/ViewManager.h
+++ b/src/ViewManager.h
@@ -387,7 +387,7 @@ private:
 
     NavigationMethod  _navigationMethod;
 
-    ViewContainer::NavigationDisplayMode _navigationVisibility;
+    ViewContainer::NavigationVisibility _navigationVisibility;
     ViewContainer::NavigationPosition _navigationPosition;
     bool _showQuickButtons;
     NewTabBehavior _newTabBehavior;