diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt
index e4af7c128..2517dc5a3 100644
--- a/src/modules/partition/CMakeLists.txt
+++ b/src/modules/partition/CMakeLists.txt
@@ -11,7 +11,7 @@ calamares_add_plugin( partition
         DeviceModel.cpp
         PartitionModel.cpp
         PartitionPage.cpp
-        PartitionViewPlugin.cpp
+        PartitionViewStep.cpp
     UI
         PartitionPage.ui
     LINK_LIBRARIES
diff --git a/src/modules/partition/PartitionViewPlugin.cpp b/src/modules/partition/PartitionViewStep.cpp
similarity index 77%
rename from src/modules/partition/PartitionViewPlugin.cpp
rename to src/modules/partition/PartitionViewStep.cpp
index 73270dae2..9a4e60b71 100644
--- a/src/modules/partition/PartitionViewPlugin.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -16,12 +16,12 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "PartitionViewPlugin.h"
+#include "PartitionViewStep.h"
 
 #include "PartitionPage.h"
 
 
-PartitionViewPlugin::PartitionViewPlugin( QObject* parent )
+PartitionViewStep::PartitionViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_widget( new PartitionPage() )
 {
@@ -29,47 +29,47 @@ PartitionViewPlugin::PartitionViewPlugin( QObject* parent )
 
 
 QString
-PartitionViewPlugin::prettyName()
+PartitionViewStep::prettyName()
 {
     return tr( "Partitions" );
 }
 
 
 QWidget*
-PartitionViewPlugin::widget()
+PartitionViewStep::widget()
 {
     return m_widget;
 }
 
 
 void
-PartitionViewPlugin::next()
+PartitionViewStep::next()
 {
     emit done();
 }
 
 
 void
-PartitionViewPlugin::back()
+PartitionViewStep::back()
 {}
 
 
 bool
-PartitionViewPlugin::isNextEnabled()
+PartitionViewStep::isNextEnabled()
 {
     return false;
 }
 
 
 bool
-PartitionViewPlugin::isAtBeginning()
+PartitionViewStep::isAtBeginning()
 {
     return true;
 }
 
 
 bool
-PartitionViewPlugin::isAtEnd()
+PartitionViewStep::isAtEnd()
 {
     return true;
 }
diff --git a/src/modules/partition/PartitionViewPlugin.h b/src/modules/partition/PartitionViewStep.h
similarity index 85%
rename from src/modules/partition/PartitionViewPlugin.h
rename to src/modules/partition/PartitionViewStep.h
index 7510d3948..44044650d 100644
--- a/src/modules/partition/PartitionViewPlugin.h
+++ b/src/modules/partition/PartitionViewStep.h
@@ -16,8 +16,8 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PARTITIONPAGEPLUGIN_H
-#define PARTITIONPAGEPLUGIN_H
+#ifndef PARTITIONVIEWSTEP_H
+#define PARTITIONVIEWSTEP_H
 
 #include <QObject>
 
@@ -26,14 +26,14 @@
 
 class PartitionPage;
 
-class PLUGINDLLEXPORT PartitionViewPlugin : public Calamares::ViewStep
+class PLUGINDLLEXPORT PartitionViewStep : public Calamares::ViewStep
 {
     Q_OBJECT
     Q_PLUGIN_METADATA( IID "calamares.ViewModule/1.0" )
     Q_INTERFACES( Calamares::ViewStep )
 
 public:
-    explicit PartitionViewPlugin( QObject* parent = 0 );
+    explicit PartitionViewStep( QObject* parent = 0 );
 
     QString prettyName() override;
 
@@ -51,4 +51,4 @@ private:
     PartitionPage* m_widget;
 };
 
-#endif // PARTITIONPAGEPLUGIN_H
+#endif // PARTITIONVIEWSTEP_H