diff --git a/src/AutoHideTab.cpp b/src/AutoHideTab.cpp
index b0b4471..461085d 100644
--- a/src/AutoHideTab.cpp
+++ b/src/AutoHideTab.cpp
@@ -85,19 +85,19 @@ void AutoHideTabPrivate::updateOrientation()
 	switch (area)
 	{
 	case SideBarLocation::Left:
-		 IconOnly = CDockManager::testConfigFlag(CDockManager::LeftSideBarIconOnly);
+		 IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::LeftSideBarIconOnly);
 		 break;
 
 	case SideBarLocation::Right:
-		 IconOnly = CDockManager::testConfigFlag(CDockManager::RightSideBarIconOnly);
+		 IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::RightSideBarIconOnly);
 		 break;
 
 	case SideBarLocation::Top:
-		 IconOnly = CDockManager::testConfigFlag(CDockManager::BottomSideBarIconOnly);
+		 IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::BottomSideBarIconOnly);
 		 break;
 
 	case SideBarLocation::Bottom:
-		 IconOnly = CDockManager::testConfigFlag(CDockManager::TopSideBarIconOnly);
+		 IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::TopSideBarIconOnly);
 		 break;
 	}
 
diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp
index 95eae21..1ca898e 100644
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -124,9 +124,9 @@ struct DockAreaTitleBarPrivate
 	 * Returns true if the given config flag is set
 	 * Convenience function to ease config flag testing
 	 */
-	static bool testConfigFlag(CDockManager::eAutoHideFlag Flag)
+	static bool testAutoHideConfigFlag(CDockManager::eAutoHideFlag Flag)
 	{
-		return CDockManager::testConfigFlag(Flag);
+		return CDockManager::testAutoHideConfigFlag(Flag);
 	}
 
 	/**
@@ -191,14 +191,14 @@ void DockAreaTitleBarPrivate::createButtons()
 	_this->connect(UndockButton, SIGNAL(clicked()), SLOT(onUndockButtonClicked()));
 
 	// AutoHide Button
-	const auto autoHideEnabled = testConfigFlag(CDockManager::AutoHideFeatureEnabled);
-	AutoHideButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasAutoHideButton) && autoHideEnabled);
+	const auto autoHideEnabled = testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled);
+	AutoHideButton = new CTitleBarButton(testAutoHideConfigFlag(CDockManager::DockAreaHasAutoHideButton) && autoHideEnabled);
 	AutoHideButton->setObjectName("dockAreaAutoHideButton");
 	AutoHideButton->setAutoRaise(true);
 	internal::setToolTip(AutoHideButton, QObject::tr("Toggle Auto Hide"));
 	internal::setButtonIcon(AutoHideButton, QStyle::SP_DialogOkButton, ads::AutoHideIcon);
 	AutoHideButton->setSizePolicy(ButtonSizePolicy);
-	AutoHideButton->setCheckable(testConfigFlag(CDockManager::AutoHideButtonCheckable));
+	AutoHideButton->setCheckable(testAutoHideConfigFlag(CDockManager::AutoHideButtonCheckable));
 	AutoHideButton->setChecked(false);
 	Layout->addWidget(AutoHideButton, 0);
 	_this->connect(AutoHideButton, SIGNAL(clicked()),  SLOT(onAutoHideButtonClicked()));
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index c6d5523..5035237 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -1176,7 +1176,7 @@ void CDockAreaWidget::toggleAutoHideArea(bool Enable)
 
 	const auto area = dockContainer()->calculateSideTabBarArea(this);
 
-	if (dockManager()->testConfigFlag(CDockManager::AutoHideButtonTogglesArea))
+	if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideButtonTogglesArea))
 	{
 		for (const auto DockWidget : openedDockWidgets())
 		{
diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp
index 459b166..c50918f 100644
--- a/src/DockContainerWidget.cpp
+++ b/src/DockContainerWidget.cpp
@@ -1045,7 +1045,7 @@ bool DockContainerWidgetPrivate::restoreSideBar(CDockingStateReader& s,
 	Q_UNUSED(CreatedWidget)
 	// Simply ignore side bar auto hide widgets from saved state if
 	// auto hide support is disabled
-	if (!CDockManager::testConfigFlag(CDockManager::AutoHideFeatureEnabled))
+	if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
 	{
 		return true;
 	}
@@ -1374,7 +1374,7 @@ CDockAreaWidget* CDockContainerWidget::addDockWidget(DockWidgetArea area, CDockW
 CAutoHideDockContainer* CDockContainerWidget::createAndSetupAutoHideContainer(
 	SideBarLocation area, CDockWidget* DockWidget, CDockWidget::eAutoHideInsertOrder insertOrder)
 {
-	if (!CDockManager::testConfigFlag(CDockManager::AutoHideFeatureEnabled))
+	if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
 	{
 		Q_ASSERT_X(false, "CDockContainerWidget::createAndInitializeDockWidgetOverlayContainer",
 			"Requested area does not exist in config");
@@ -1951,7 +1951,7 @@ void CDockContainerWidget::createRootSplitter()
 //============================================================================
 void CDockContainerWidget::createSideTabBarWidgets()
 {
-	if (!CDockManager::testConfigFlag(CDockManager::AutoHideFeatureEnabled))
+	if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
 	{
 		return;
 	}
diff --git a/src/DockManager.cpp b/src/DockManager.cpp
index 5b4aefa..d07c4ff 100644
--- a/src/DockManager.cpp
+++ b/src/DockManager.cpp
@@ -1183,7 +1183,7 @@ bool CDockManager::testConfigFlag(eConfigFlag Flag)
 
 
 //===========================================================================
-bool CDockManager::testConfigFlag(eAutoHideFlag Flag)
+bool CDockManager::testAutoHideConfigFlag(eAutoHideFlag Flag)
 {
 	return autoHideConfigFlags().testFlag(Flag);
 }
diff --git a/src/DockManager.h b/src/DockManager.h
index 810ebbf..6af42e5 100644
--- a/src/DockManager.h
+++ b/src/DockManager.h
@@ -307,7 +307,7 @@ public:
 	/**
 	 * Returns true if the given overlay config flag is set
 	 */
-	static bool testConfigFlag(eAutoHideFlag Flag);
+	static bool testAutoHideConfigFlag(eAutoHideFlag Flag);
 
 	/**
 	 * Returns the global icon provider.
diff --git a/src/DockWidgetTab.cpp b/src/DockWidgetTab.cpp
index e82ae77..30c5135 100644
--- a/src/DockWidgetTab.cpp
+++ b/src/DockWidgetTab.cpp
@@ -343,10 +343,6 @@ CDockWidgetTab::CDockWidgetTab(CDockWidget* DockWidget, QWidget *parent) :
 	d->DockWidget = DockWidget;
 	d->createLayout();
 	setFocusPolicy(Qt::NoFocus);
-	/*if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting))
-	{
-		setFocusPolicy(Qt::ClickFocus);
-	}*/
 }
 
 //============================================================================