diff --git a/addons/symbolviewer/bash_parser.cpp b/addons/symbolviewer/bash_parser.cpp
--- a/addons/symbolviewer/bash_parser.cpp
+++ b/addons/symbolviewer/bash_parser.cpp
@@ -22,7 +22,7 @@
 
 #include "plugin_katesymbolviewer.h"
 
-void KatePluginSymbolViewerView::parseBashSymbols(void)
+void SymbolView::parseBashSymbols(void)
 {
        if (!m_mainWindow->activeView())
                return;
diff --git a/addons/symbolviewer/cpp_parser.cpp b/addons/symbolviewer/cpp_parser.cpp
--- a/addons/symbolviewer/cpp_parser.cpp
+++ b/addons/symbolviewer/cpp_parser.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 #include "plugin_katesymbolviewer.h"
 
-void KatePluginSymbolViewerView::parseCppSymbols(void)
+void SymbolView::parseCppSymbols(void)
 {
   if (!m_mainWindow->activeView())
    return;
diff --git a/addons/symbolviewer/ecma_parser.cpp b/addons/symbolviewer/ecma_parser.cpp
--- a/addons/symbolviewer/ecma_parser.cpp
+++ b/addons/symbolviewer/ecma_parser.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 #include "plugin_katesymbolviewer.h"
 
-void KatePluginSymbolViewerView::parseEcmaSymbols(void)
+void SymbolView::parseEcmaSymbols(void)
 {
   // make sure there is an active view to attach to
   if (!m_mainWindow->activeView()) return;
diff --git a/addons/symbolviewer/fortran_parser.cpp b/addons/symbolviewer/fortran_parser.cpp
--- a/addons/symbolviewer/fortran_parser.cpp
+++ b/addons/symbolviewer/fortran_parser.cpp
@@ -16,7 +16,7 @@
 
 #include "plugin_katesymbolviewer.h"
 
-void KatePluginSymbolViewerView::parseFortranSymbols(void)
+void SymbolView::parseFortranSymbols(void)
 {
  if (!m_mainWindow->activeView())
    return;
diff --git a/addons/symbolviewer/perl_parser.cpp b/addons/symbolviewer/perl_parser.cpp
--- a/addons/symbolviewer/perl_parser.cpp
+++ b/addons/symbolviewer/perl_parser.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 #include "plugin_katesymbolviewer.h"
 
-void KatePluginSymbolViewerView::parsePerlSymbols(void)
+void SymbolView::parsePerlSymbols(void)
 {
  if (!m_mainWindow->activeView())
    return;
diff --git a/addons/symbolviewer/php_parser.cpp b/addons/symbolviewer/php_parser.cpp
--- a/addons/symbolviewer/php_parser.cpp
+++ b/addons/symbolviewer/php_parser.cpp
@@ -17,7 +17,7 @@
 
 #include "plugin_katesymbolviewer.h"
 
-void KatePluginSymbolViewerView::parsePhpSymbols(void)
+void SymbolView::parsePhpSymbols(void)
 {
   if (m_mainWindow->activeView())
   {
diff --git a/addons/symbolviewer/plugin_katesymbolviewer.h b/addons/symbolviewer/plugin_katesymbolviewer.h
--- a/addons/symbolviewer/plugin_katesymbolviewer.h
+++ b/addons/symbolviewer/plugin_katesymbolviewer.h
@@ -82,15 +82,15 @@
 
 class KatePluginSymbolViewer;
 
-class KatePluginSymbolViewerView :  public QObject, public KXMLGUIClient
+class SymbolView : public QObject, public KXMLGUIClient
 {
   Q_OBJECT
 
   friend class KatePluginSymbolViewer;
 
   public:
-    KatePluginSymbolViewerView (KatePluginSymbolViewer *plugin, KTextEditor::MainWindow *mw);
-    ~KatePluginSymbolViewerView () override;
+    SymbolView(KatePluginSymbolViewer *plugin, KTextEditor::MainWindow *mw);
+   ~SymbolView() override;
 
 
   public Q_SLOTS:
@@ -157,7 +157,7 @@
     bool expandedOn;
 
   private:
-    KatePluginSymbolViewerView* m_view = nullptr;
+    SymbolView* m_view = nullptr;
 };
 
 /* XPM */
diff --git a/addons/symbolviewer/plugin_katesymbolviewer.cpp b/addons/symbolviewer/plugin_katesymbolviewer.cpp
--- a/addons/symbolviewer/plugin_katesymbolviewer.cpp
+++ b/addons/symbolviewer/plugin_katesymbolviewer.cpp
@@ -68,7 +68,7 @@
 
 K_PLUGIN_FACTORY_WITH_JSON (KatePluginSymbolViewerFactory, "katesymbolviewerplugin.json", registerPlugin<KatePluginSymbolViewer>();)
 
-KatePluginSymbolViewerView::KatePluginSymbolViewerView(KatePluginSymbolViewer *plugin, KTextEditor::MainWindow *mw)
+SymbolView::SymbolView(KatePluginSymbolViewer *plugin, KTextEditor::MainWindow *mw)
 :QObject(mw)
 ,m_mainWindow(mw)
 ,m_plugin(plugin)
@@ -82,16 +82,16 @@
   m_symbols = nullptr;
 
   m_popup = new QMenu(m_symbols);
-  m_treeOn = m_popup->addAction(i18n("Tree Mode"), this, &KatePluginSymbolViewerView::parseSymbols);
+  m_treeOn = m_popup->addAction(i18n("Tree Mode"), this, &SymbolView::parseSymbols);
   m_treeOn->setCheckable(true);
-  m_sort = m_popup->addAction(i18n("Show Sorted"), this, &KatePluginSymbolViewerView::parseSymbols);
+  m_sort = m_popup->addAction(i18n("Show Sorted"), this, &SymbolView::parseSymbols);
   m_sort->setCheckable(true);
   m_popup->addSeparator();
-  m_macro = m_popup->addAction(i18n("Show Macros"), this, &KatePluginSymbolViewerView::parseSymbols);
+  m_macro = m_popup->addAction(i18n("Show Macros"), this, &SymbolView::parseSymbols);
   m_macro->setCheckable(true);
-  m_struct = m_popup->addAction(i18n("Show Structures"), this, &KatePluginSymbolViewerView::parseSymbols);
+  m_struct = m_popup->addAction(i18n("Show Structures"), this, &SymbolView::parseSymbols);
   m_struct->setCheckable(true);
-  m_func = m_popup->addAction(i18n("Show Functions"), this, &KatePluginSymbolViewerView::parseSymbols);
+  m_func = m_popup->addAction(i18n("Show Functions"), this, &SymbolView::parseSymbols);
   m_func->setCheckable(true);
 
   KConfigGroup config(KSharedConfig::openConfig(), "PluginSymbolViewer");
@@ -105,10 +105,10 @@
   m_func->setChecked(true);
 
   m_updateTimer.setSingleShot(true);
-  connect(&m_updateTimer, &QTimer::timeout, this, &KatePluginSymbolViewerView::parseSymbols);
+  connect(&m_updateTimer, &QTimer::timeout, this, &SymbolView::parseSymbols);
 
   m_currItemTimer.setSingleShot(true);
-  connect(&m_currItemTimer, &QTimer::timeout, this, &KatePluginSymbolViewerView::updateCurrTreeItem);
+  connect(&m_currItemTimer, &QTimer::timeout, this, &SymbolView::updateCurrTreeItem);
 
   QPixmap cls( ( const char** ) class_xpm );
 
@@ -126,10 +126,10 @@
   layout->addWidget(m_symbols, 10);
   layout->setContentsMargins(0,0,0,0);
 
-  connect(m_symbols, &QTreeWidget::itemClicked, this, &KatePluginSymbolViewerView::goToSymbol);
-  connect(m_symbols, &QTreeWidget::customContextMenuRequested, this, &KatePluginSymbolViewerView::slotShowContextMenu);
+  connect(m_symbols, &QTreeWidget::itemClicked, this, &SymbolView::goToSymbol);
+  connect(m_symbols, &QTreeWidget::customContextMenuRequested, this, &SymbolView::slotShowContextMenu);
 
-  connect(m_mainWindow, &KTextEditor::MainWindow::viewChanged, this, &KatePluginSymbolViewerView::slotDocChanged);
+  connect(m_mainWindow, &KTextEditor::MainWindow::viewChanged, this, &SymbolView::slotDocChanged);
 
   QStringList titles;
   titles << i18nc("@title:column", "Symbols") << i18nc("@title:column", "Position");
@@ -145,35 +145,35 @@
   m_toolview->installEventFilter(this);
 }
 
-KatePluginSymbolViewerView::~KatePluginSymbolViewerView()
+SymbolView::~SymbolView()
 {
   m_mainWindow->guiFactory()->removeClient (this);
   delete m_toolview;
   delete m_popup;
 }
 
-void KatePluginSymbolViewerView::slotDocChanged()
+void SymbolView::slotDocChanged()
 {
  parseSymbols();
 
  KTextEditor::View *view = m_mainWindow->activeView();
  //qDebug()<<"Document changed !!!!" << view;
  if (view) {
-   connect(view, &KTextEditor::View::cursorPositionChanged, this, &KatePluginSymbolViewerView::cursorPositionChanged, Qt::UniqueConnection);
+   connect(view, &KTextEditor::View::cursorPositionChanged, this, &SymbolView::cursorPositionChanged, Qt::UniqueConnection);
 
    if (view->document()) {
-     connect(view->document(), &KTextEditor::Document::textChanged, this, &KatePluginSymbolViewerView::slotDocEdited, Qt::UniqueConnection);
+     connect(view->document(), &KTextEditor::Document::textChanged, this, &SymbolView::slotDocEdited, Qt::UniqueConnection);
    }
  }
 }
 
-void KatePluginSymbolViewerView::slotDocEdited()
+void SymbolView::slotDocEdited()
 {
   m_currItemTimer.stop(); // Avoid unneeded update
   m_updateTimer.start(500);
 }
 
-void KatePluginSymbolViewerView::cursorPositionChanged()
+void SymbolView::cursorPositionChanged()
 {
   if (m_updateTimer.isActive()) {
     // No need for update, will come anyway
@@ -182,7 +182,7 @@
   m_currItemTimer.start(100);
 }
 
-void KatePluginSymbolViewerView::updateCurrTreeItem()
+void SymbolView::updateCurrTreeItem()
 {
   if (!m_mainWindow) {
     return;
@@ -218,7 +218,7 @@
   }
 }
 
-QTreeWidgetItem *KatePluginSymbolViewerView::newActveItem(int &newItemLine, int currLine, QTreeWidgetItem *item)
+QTreeWidgetItem *SymbolView::newActveItem(int &newItemLine, int currLine, QTreeWidgetItem *item)
 {
   QTreeWidgetItem *newItem = nullptr;
   QTreeWidgetItem *tmp = nullptr;
@@ -236,7 +236,7 @@
   return newItem;
 }
 
-bool KatePluginSymbolViewerView::eventFilter(QObject *obj, QEvent *event)
+bool SymbolView::eventFilter(QObject *obj, QEvent *event)
 {
   if (event->type() == QEvent::KeyPress) {
     QKeyEvent *ke = static_cast<QKeyEvent*>(event);
@@ -249,12 +249,12 @@
   return QObject::eventFilter(obj, event);
 }
 
-void KatePluginSymbolViewerView::slotShowContextMenu(const QPoint&)
+void SymbolView::slotShowContextMenu(const QPoint&)
 {
   m_popup->popup(QCursor::pos(), m_treeOn);
 }
 
-void KatePluginSymbolViewerView::parseSymbols()
+void SymbolView::parseSymbols()
 {
   if (!m_symbols)
     return;
@@ -309,7 +309,7 @@
     m_symbols->sortItems(0, Qt::AscendingOrder);
 }
 
-void KatePluginSymbolViewerView::goToSymbol(QTreeWidgetItem *it)
+void SymbolView::goToSymbol(QTreeWidgetItem *it)
 {
   KTextEditor::View *kv = m_mainWindow->activeView();
 
@@ -333,9 +333,9 @@
   //qDebug()<<"~KatePluginSymbolViewer";
 }
 
-QObject *KatePluginSymbolViewer::createView (KTextEditor::MainWindow *mainWindow)
+QObject *KatePluginSymbolViewer::createView(KTextEditor::MainWindow *mainWindow)
 {
-  m_view = new KatePluginSymbolViewerView (this, mainWindow);
+  m_view = new SymbolView(this, mainWindow);
   return m_view;
 }
 
diff --git a/addons/symbolviewer/python_parser.cpp b/addons/symbolviewer/python_parser.cpp
--- a/addons/symbolviewer/python_parser.cpp
+++ b/addons/symbolviewer/python_parser.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 #include "plugin_katesymbolviewer.h"
 
-void KatePluginSymbolViewerView::parsePythonSymbols(void)
+void SymbolView::parsePythonSymbols(void)
 {
   if (!m_mainWindow->activeView())
    return;
diff --git a/addons/symbolviewer/ruby_parser.cpp b/addons/symbolviewer/ruby_parser.cpp
--- a/addons/symbolviewer/ruby_parser.cpp
+++ b/addons/symbolviewer/ruby_parser.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 #include "plugin_katesymbolviewer.h"
 
-void KatePluginSymbolViewerView::parseRubySymbols(void)
+void SymbolView::parseRubySymbols(void)
 {
   if (!m_mainWindow->activeView())
    return;
diff --git a/addons/symbolviewer/tcl_parser.cpp b/addons/symbolviewer/tcl_parser.cpp
--- a/addons/symbolviewer/tcl_parser.cpp
+++ b/addons/symbolviewer/tcl_parser.cpp
@@ -17,7 +17,7 @@
 #include "plugin_katesymbolviewer.h"
 #include <QPixmap>
 
-void KatePluginSymbolViewerView::parseTclSymbols(void)
+void SymbolView::parseTclSymbols(void)
 {
   if (!m_mainWindow->activeView())
    return;
diff --git a/addons/symbolviewer/xslt_parser.cpp b/addons/symbolviewer/xslt_parser.cpp
--- a/addons/symbolviewer/xslt_parser.cpp
+++ b/addons/symbolviewer/xslt_parser.cpp
@@ -16,7 +16,7 @@
 
 #include "plugin_katesymbolviewer.h"
 
-void KatePluginSymbolViewerView::parseXsltSymbols(void)
+void SymbolView::parseXsltSymbols(void)
 {
   if (!m_mainWindow->activeView())
    return;