diff --git a/src/gui/symbology/qgscategorizedsymbolrendererwidget.h b/src/gui/symbology/qgscategorizedsymbolrendererwidget.h
index a831c9947c7..35d50d1b4d2 100644
--- a/src/gui/symbology/qgscategorizedsymbolrendererwidget.h
+++ b/src/gui/symbology/qgscategorizedsymbolrendererwidget.h
@@ -12,8 +12,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef QGSCATEGORIZEDSYMBOLRENDERERV2WIDGET_H
-#define QGSCATEGORIZEDSYMBOLRENDERERV2WIDGET_H
+#ifndef QGSCATEGORIZEDSYMBOLRENDERERWIDGET_H
+#define QGSCATEGORIZEDSYMBOLRENDERERWIDGET_H
 
 #include "qgscategorizedsymbolrenderer.h"
 #include "qgis.h"
@@ -25,7 +25,7 @@
 class QgsCategorizedSymbolRenderer;
 class QgsRendererCategory;
 
-#include "ui_qgscategorizedsymbolrendererv2widget.h"
+#include "ui_qgscategorizedsymbolrendererwidget.h"
 #include "qgis_gui.h"
 
 
@@ -195,4 +195,4 @@ class GUI_EXPORT QgsCategorizedSymbolRendererWidget : public QgsRendererWidget,
     QgsExpressionContext createExpressionContext() const override;
 };
 
-#endif // QGSCATEGORIZEDSYMBOLRENDERERV2WIDGET_H
+#endif // QGSCATEGORIZEDSYMBOLRENDERERWIDGET_H
diff --git a/src/gui/symbology/qgscptcitycolorrampdialog.h b/src/gui/symbology/qgscptcitycolorrampdialog.h
index 6de4ef5d3dd..ad8ff9526f4 100644
--- a/src/gui/symbology/qgscptcitycolorrampdialog.h
+++ b/src/gui/symbology/qgscptcitycolorrampdialog.h
@@ -13,11 +13,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSCPTCITYCOLORRAMPV2DIALOG_H
-#define QGSCPTCITYCOLORRAMPV2DIALOG_H
+#ifndef QGSCPTCITYCOLORRAMPDIALOG_H
+#define QGSCPTCITYCOLORRAMPDIALOG_H
 
 
-#include "ui_qgscptcitycolorrampv2dialogbase.h"
+#include "ui_qgscptcitycolorrampdialogbase.h"
 #include "qgis.h"
 #include <QDialog>
 
diff --git a/src/gui/symbology/qgsgraduatedsymbolrendererwidget.h b/src/gui/symbology/qgsgraduatedsymbolrendererwidget.h
index f4e56ae0c36..9aac7ce6866 100644
--- a/src/gui/symbology/qgsgraduatedsymbolrendererwidget.h
+++ b/src/gui/symbology/qgsgraduatedsymbolrendererwidget.h
@@ -13,8 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSGRADUATEDSYMBOLRENDERERV2WIDGET_H
-#define QGSGRADUATEDSYMBOLRENDERERV2WIDGET_H
+#ifndef QGSGRADUATEDSYMBOLRENDERERWIDGET_H
+#define QGSGRADUATEDSYMBOLRENDERERWIDGET_H
 
 #include "qgsgraduatedsymbolrenderer.h"
 #include "qgis.h"
@@ -22,7 +22,7 @@
 #include "qgsproxystyle.h"
 #include <QStandardItem>
 
-#include "ui_qgsgraduatedsymbolrendererv2widget.h"
+#include "ui_qgsgraduatedsymbolrendererwidget.h"
 #include "qgis_gui.h"
 
 #ifndef SIP_RUN
@@ -170,4 +170,4 @@ class GUI_EXPORT QgsGraduatedSymbolRendererWidget : public QgsRendererWidget, pr
 };
 
 
-#endif // QGSGRADUATEDSYMBOLRENDERERV2WIDGET_H
+#endif // QGSGRADUATEDSYMBOLRENDERERWIDGET_H
diff --git a/src/gui/symbology/qgsrendererpropertiesdialog.h b/src/gui/symbology/qgsrendererpropertiesdialog.h
index b18a3d0e881..2784a23e578 100644
--- a/src/gui/symbology/qgsrendererpropertiesdialog.h
+++ b/src/gui/symbology/qgsrendererpropertiesdialog.h
@@ -14,13 +14,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSRENDERERV2PROPERTIESDIALOG_H
-#define QGSRENDERERV2PROPERTIESDIALOG_H
+#ifndef QGSRENDERERPROPERTIESDIALOG_H
+#define QGSRENDERERPROPERTIESDIALOG_H
 
 #include <QDialog>
 #include "qgis.h"
 
-#include "ui_qgsrendererv2propsdialogbase.h"
+#include "ui_qgsrendererpropsdialogbase.h"
 
 #include "qgsfeaturerequest.h"
 #include "qgis_gui.h"
diff --git a/src/gui/symbology/qgsrulebasedrendererwidget.h b/src/gui/symbology/qgsrulebasedrendererwidget.h
index 67222edbb19..0c60511e29b 100644
--- a/src/gui/symbology/qgsrulebasedrendererwidget.h
+++ b/src/gui/symbology/qgsrulebasedrendererwidget.h
@@ -13,8 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSRULEBASEDRENDERERV2WIDGET_H
-#define QGSRULEBASEDRENDERERV2WIDGET_H
+#ifndef QGSRULEBASEDRENDERERWIDGET_H
+#define QGSRULEBASEDRENDERERWIDGET_H
 
 #include "qgsrendererwidget.h"
 #include "qgis.h"
@@ -100,7 +100,7 @@ class GUI_EXPORT QgsRuleBasedRendererModel : public QAbstractItemModel
 
 ///////
 
-#include "ui_qgsrulebasedrendererv2widget.h"
+#include "ui_qgsrulebasedrendererwidget.h"
 
 /**
  * \ingroup gui
@@ -282,4 +282,4 @@ class GUI_EXPORT QgsRendererRulePropsDialog : public QDialog
 };
 
 
-#endif // QGSRULEBASEDRENDERERV2WIDGET_H
+#endif // QGSRULEBASEDRENDERERWIDGET_H
diff --git a/src/ui/qgscategorizedsymbolrendererv2widget.ui b/src/ui/qgscategorizedsymbolrendererwidget.ui
similarity index 100%
rename from src/ui/qgscategorizedsymbolrendererv2widget.ui
rename to src/ui/qgscategorizedsymbolrendererwidget.ui
diff --git a/src/ui/qgscptcitycolorrampv2dialogbase.ui b/src/ui/qgscptcitycolorrampdialogbase.ui
similarity index 100%
rename from src/ui/qgscptcitycolorrampv2dialogbase.ui
rename to src/ui/qgscptcitycolorrampdialogbase.ui
diff --git a/src/ui/qgsgraduatedsymbolrendererv2widget.ui b/src/ui/qgsgraduatedsymbolrendererwidget.ui
similarity index 100%
rename from src/ui/qgsgraduatedsymbolrendererv2widget.ui
rename to src/ui/qgsgraduatedsymbolrendererwidget.ui
diff --git a/src/ui/qgsrendererv2propsdialogbase.ui b/src/ui/qgsrendererpropsdialogbase.ui
similarity index 100%
rename from src/ui/qgsrendererv2propsdialogbase.ui
rename to src/ui/qgsrendererpropsdialogbase.ui
diff --git a/src/ui/qgsrulebasedrendererv2widget.ui b/src/ui/qgsrulebasedrendererwidget.ui
similarity index 100%
rename from src/ui/qgsrulebasedrendererv2widget.ui
rename to src/ui/qgsrulebasedrendererwidget.ui