diff --git a/GUI/Views/SampleDesigner/SampleToolBox.cpp b/GUI/Views/SampleDesigner/SampleToolBox.cpp
index fd8dbc1cf705db026a3ae31207bf280f87169533..f42a152edd925a8c4441b33cd9efc86a211e0dcc 100644
--- a/GUI/Views/SampleDesigner/SampleToolBox.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBox.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/SampleDesigner/SampleToolBox.h"
 #include "GUI/Views/widgetbox/DesignerMimeData.h"
-#include "GUI/Views/widgetbox/widgetboxtreewidget.h"
+#include "GUI/Views/widgetbox/SampleToolBoxTreeWidget.h"
 #include <QApplication>
 #include <QFocusEvent>
 #include <QIcon>
@@ -57,7 +57,7 @@ protected:
 } // namespace
 
 
-SampleToolBox::SampleToolBox(QWidget* parent) : QWidget(parent), m_view(new WidgetBoxTreeWidget)
+SampleToolBox::SampleToolBox(QWidget* parent) : QWidget(parent), m_view(new SampleToolBoxTreeWidget)
 {
     setObjectName(QLatin1String("SampleToolBox"));
     setWindowTitle("Items Toolbox");
@@ -67,7 +67,7 @@ SampleToolBox::SampleToolBox(QWidget* parent) : QWidget(parent), m_view(new Widg
     QLineEdit* filterEdit = new FilterEdit(toolBar);
     filterEdit->setPlaceholderText("Filter");
     filterEdit->setClearButtonEnabled(true);
-    connect(filterEdit, &QLineEdit::textChanged, m_view, &WidgetBoxTreeWidget::filter);
+    connect(filterEdit, &QLineEdit::textChanged, m_view, &SampleToolBoxTreeWidget::filter);
     toolBar->addWidget(filterEdit);
 
     QVBoxLayout* layout = new QVBoxLayout(this);
@@ -77,7 +77,7 @@ SampleToolBox::SampleToolBox(QWidget* parent) : QWidget(parent), m_view(new Widg
     layout->addWidget(m_view);
     setLayout(layout);
 
-    connect(m_view, &WidgetBoxTreeWidget::pressed, this, &SampleToolBox::handleMousePress);
+    connect(m_view, &SampleToolBoxTreeWidget::pressed, this, &SampleToolBox::handleMousePress);
 
     fill();
 }
diff --git a/GUI/Views/SampleDesigner/SampleToolBox.h b/GUI/Views/SampleDesigner/SampleToolBox.h
index 8cba4af0d181f8371895593abd7b43e1e2329ef9..670ffbfee7d9dbca9cb12736a74d226644a68f07 100644
--- a/GUI/Views/SampleDesigner/SampleToolBox.h
+++ b/GUI/Views/SampleDesigner/SampleToolBox.h
@@ -17,7 +17,7 @@
 
 #include <QWidget>
 
-class WidgetBoxTreeWidget;
+class SampleToolBoxTreeWidget;
 
 //! ToolBox on the left side of SampleView
 class SampleToolBox : public QWidget {
@@ -34,7 +34,7 @@ private slots:
                           const QPoint& globalMousePos);
 
 private:
-    WidgetBoxTreeWidget* m_view;
+    SampleToolBoxTreeWidget* m_view;
 };
 
 #endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOX_H
diff --git a/GUI/Views/widgetbox/widgetboxtreewidget.cpp b/GUI/Views/widgetbox/SampleToolBoxTreeWidget.cpp
similarity index 83%
rename from GUI/Views/widgetbox/widgetboxtreewidget.cpp
rename to GUI/Views/widgetbox/SampleToolBoxTreeWidget.cpp
index 2e57a9e178914c3276a2fd66bf3737102f42bb44..6bc4ba48905c9749a1aafb3aef3f312b78c78024 100644
--- a/GUI/Views/widgetbox/widgetboxtreewidget.cpp
+++ b/GUI/Views/widgetbox/SampleToolBoxTreeWidget.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/widgetbox/widgetboxtreewidget.cpp
-//! @brief     Implements class WidgetBoxTreeWidget
+//! @file      GUI/Views/widgetbox/SampleToolBoxTreeWidget.cpp
+//! @brief     Implements class SampleToolBoxTreeWidget
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Views/widgetbox/widgetboxtreewidget.h"
+#include "GUI/Views/widgetbox/SampleToolBoxTreeWidget.h"
 #include "Base/Utils/Assert.h"
 #include "GUI/Views/widgetbox/SampleToolBoxGroupView.h"
 
@@ -27,7 +27,8 @@
 #include <QMenu>
 #include <QTreeWidgetItem>
 
-WidgetBoxTreeWidget::WidgetBoxTreeWidget(QWidget* parent) : QTreeWidget(parent), m_iconMode(false)
+SampleToolBoxTreeWidget::SampleToolBoxTreeWidget(QWidget* parent)
+    : QTreeWidget(parent), m_iconMode(false)
 {
     setFocusPolicy(Qt::NoFocus);
     setIndentation(0);
@@ -46,7 +47,7 @@ WidgetBoxTreeWidget::WidgetBoxTreeWidget(QWidget* parent) : QTreeWidget(parent),
             SLOT(handleMousePress(QTreeWidgetItem*)));
 }
 
-SampleToolBoxGroupView* WidgetBoxTreeWidget::categoryViewAt(int idx) const
+SampleToolBoxGroupView* SampleToolBoxTreeWidget::categoryViewAt(int idx) const
 {
     SampleToolBoxGroupView* rc = nullptr;
     if (QTreeWidgetItem* cat_item = topLevelItem(idx))
@@ -56,7 +57,7 @@ SampleToolBoxGroupView* WidgetBoxTreeWidget::categoryViewAt(int idx) const
     return rc;
 }
 
-void WidgetBoxTreeWidget::handleMousePress(QTreeWidgetItem* item)
+void SampleToolBoxTreeWidget::handleMousePress(QTreeWidgetItem* item)
 {
     if (item == nullptr)
         return;
@@ -74,7 +75,8 @@ void WidgetBoxTreeWidget::handleMousePress(QTreeWidgetItem* item)
     }
 }
 
-SampleToolBoxGroupView* WidgetBoxTreeWidget::addCategoryView(QTreeWidgetItem* parent, bool iconMode)
+SampleToolBoxGroupView* SampleToolBoxTreeWidget::addCategoryView(QTreeWidgetItem* parent,
+                                                                 bool iconMode)
 {
     QTreeWidgetItem* embed_item = new QTreeWidgetItem(parent);
     embed_item->setFlags(Qt::ItemIsEnabled);
@@ -86,7 +88,7 @@ SampleToolBoxGroupView* WidgetBoxTreeWidget::addCategoryView(QTreeWidgetItem* pa
     return categoryView;
 }
 
-void WidgetBoxTreeWidget::adjustSubListSize(QTreeWidgetItem* cat_item)
+void SampleToolBoxTreeWidget::adjustSubListSize(QTreeWidgetItem* cat_item)
 {
     QTreeWidgetItem* embedItem = cat_item->child(0);
     if (embedItem == nullptr)
@@ -101,19 +103,19 @@ void WidgetBoxTreeWidget::adjustSubListSize(QTreeWidgetItem* cat_item)
     embedItem->setSizeHint(0, QSize(-1, height - 1));
 }
 
-void WidgetBoxTreeWidget::slotListMode()
+void SampleToolBoxTreeWidget::slotListMode()
 {
     m_iconMode = false;
     updateViewMode();
 }
 
-void WidgetBoxTreeWidget::slotIconMode()
+void SampleToolBoxTreeWidget::slotIconMode()
 {
     m_iconMode = true;
     updateViewMode();
 }
 
-void WidgetBoxTreeWidget::updateViewMode()
+void SampleToolBoxTreeWidget::updateViewMode()
 {
     if (const int numTopLevels = topLevelItemCount()) {
         for (int i = numTopLevels - 1; i >= 0; --i) {
@@ -129,7 +131,7 @@ void WidgetBoxTreeWidget::updateViewMode()
     updateGeometries();
 }
 
-void WidgetBoxTreeWidget::resizeEvent(QResizeEvent* e)
+void SampleToolBoxTreeWidget::resizeEvent(QResizeEvent* e)
 {
     QTreeWidget::resizeEvent(e);
     if (const int numTopLevels = topLevelItemCount()) {
@@ -138,7 +140,7 @@ void WidgetBoxTreeWidget::resizeEvent(QResizeEvent* e)
     }
 }
 
-void WidgetBoxTreeWidget::contextMenuEvent(QContextMenuEvent* e)
+void SampleToolBoxTreeWidget::contextMenuEvent(QContextMenuEvent* e)
 {
     QTreeWidgetItem* item = itemAt(e->pos());
 
@@ -165,7 +167,7 @@ void WidgetBoxTreeWidget::contextMenuEvent(QContextMenuEvent* e)
     menu.exec(mapToGlobal(e->pos()));
 }
 
-void WidgetBoxTreeWidget::filter(const QString& f)
+void SampleToolBoxTreeWidget::filter(const QString& f)
 {
     const bool empty = f.isEmpty();
     QRegExp re = empty ? QRegExp() : QRegExp(f, Qt::CaseInsensitive, QRegExp::FixedString);
@@ -192,7 +194,7 @@ void WidgetBoxTreeWidget::filter(const QString& f)
         updateGeometries();
 }
 
-void WidgetBoxTreeWidget::addGroup(const QString& title)
+void SampleToolBoxTreeWidget::addGroup(const QString& title)
 {
     QTreeWidgetItem* cat_item = new QTreeWidgetItem();
     cat_item->setText(0, title);
@@ -207,8 +209,8 @@ void WidgetBoxTreeWidget::addGroup(const QString& title)
     adjustSubListSize(cat_item);
 }
 
-void WidgetBoxTreeWidget::addEntry(const QString& title, const QIcon& icon,
-                                   const QString& className, const QString& tooltip)
+void SampleToolBoxTreeWidget::addEntry(const QString& title, const QIcon& icon,
+                                       const QString& className, const QString& tooltip)
 {
     const auto cat_idx = topLevelItemCount() - 1;
 
diff --git a/GUI/Views/widgetbox/widgetboxtreewidget.h b/GUI/Views/widgetbox/SampleToolBoxTreeWidget.h
similarity index 72%
rename from GUI/Views/widgetbox/widgetboxtreewidget.h
rename to GUI/Views/widgetbox/SampleToolBoxTreeWidget.h
index 99c83e57de0718926400eeb89087067af62fe14b..edb1a2aee4dee7edbde4f66a05a2b223dc4454fb 100644
--- a/GUI/Views/widgetbox/widgetboxtreewidget.h
+++ b/GUI/Views/widgetbox/SampleToolBoxTreeWidget.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/widgetbox/widgetboxtreewidget.h
-//! @brief     Defines class WidgetBoxTreeWidget
+//! @file      GUI/Views/widgetbox/SampleToolBoxTreeWidget.h
+//! @brief     Defines class SampleToolBoxTreeWidget
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,19 +12,20 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEWS_WIDGETBOX_WIDGETBOXTREEWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_WIDGETBOX_WIDGETBOXTREEWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEWS_WIDGETBOX_SAMPLETOOLBOXTREEWIDGET_H
+#define BORNAGAIN_GUI_VIEWS_WIDGETBOX_SAMPLETOOLBOXTREEWIDGET_H
 
 #include <QTreeWidget>
 
 class SampleToolBoxGroupView;
 
-//! A tree of categories
-class WidgetBoxTreeWidget : public QTreeWidget {
+//! A tree of groups inside the Sample Designer's Sample toolbox.
+//! The toolbox is the selection are at the left side of the Sample Designer.
+class SampleToolBoxTreeWidget : public QTreeWidget {
     Q_OBJECT
 
 public:
-    explicit WidgetBoxTreeWidget(QWidget* parent = 0);
+    explicit SampleToolBoxTreeWidget(QWidget* parent = 0);
 
     //! Adds a group at the end of the list
     void addGroup(const QString& title);
@@ -58,4 +59,4 @@ private:
     bool m_iconMode;
 };
 
-#endif // BORNAGAIN_GUI_VIEWS_WIDGETBOX_WIDGETBOXTREEWIDGET_H
+#endif // BORNAGAIN_GUI_VIEWS_WIDGETBOX_SAMPLETOOLBOXTREEWIDGET_H