diff --git a/src/plugins/fakevim/fakevim.pro b/src/plugins/fakevim/fakevim.pro
index 20be8c355f5b4e12adabbd5aa14673c5faa086a7..2165ffed202f99d2ae3b72a2c1b539c217922400 100644
--- a/src/plugins/fakevim/fakevim.pro
+++ b/src/plugins/fakevim/fakevim.pro
@@ -11,10 +11,10 @@ include(../../plugins/texteditor/texteditor.pri)
 QT += gui
 
 SOURCES += \
-    handler.cpp \
+    fakevimhandler.cpp \
     fakevimplugin.cpp
 
 HEADERS += \
-    handler.h \
-    fakevimplugin.h \
-    fakevimconstants.h
+    fakevimconstants.h \
+    fakevimhandler.h \
+    fakevimplugin.h
diff --git a/src/plugins/fakevim/handler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
similarity index 99%
rename from src/plugins/fakevim/handler.cpp
rename to src/plugins/fakevim/fakevimhandler.cpp
index f094bcea8988e8516ae77dc9859115736281043e..7fc69764f722594818f05540ea6764be531b3c57 100644
--- a/src/plugins/fakevim/handler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -31,7 +31,7 @@
 **
 ***************************************************************************/
 
-#include "handler.h"
+#include "fakevimhandler.h"
 
 #include "fakevimconstants.h"
 
diff --git a/src/plugins/fakevim/handler.h b/src/plugins/fakevim/fakevimhandler.h
similarity index 100%
rename from src/plugins/fakevim/handler.h
rename to src/plugins/fakevim/fakevimhandler.h
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 3bc3c7c5c7898d4fc8a68f1e4d7c849f1335d677..d48d71b3df86e622c17c25a2e860451ce429f233 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -33,7 +33,8 @@
 
 #include "fakevimplugin.h"
 
-#include "handler.h"
+#include "fakevimconstants.h"
+#include "fakevimhandler.h"
 
 #include <coreplugin/actionmanager/actionmanagerinterface.h>
 #include <coreplugin/coreconstants.h>
@@ -181,7 +182,7 @@ void FakeVimPlugin::showExtraInformation(const QString &text)
     QMessageBox::information(0, tr("FakeVim Information"), text);
 }
 
-void FakeVimPlugin::initializeConfiguaration(QHash<QString, QString> *config)
+void FakeVimPlugin::initializeConfiguration(QHash<QString, QString> *config)
 {
     qDebug() << "INIT CONFIG";
    //set shiftwidth=4
diff --git a/src/plugins/fakevim/fakevimplugin.h b/src/plugins/fakevim/fakevimplugin.h
index a6ae8f3753c8febd1e2b4ce9ef406d931d8fa059..cbd2cbab566cbca4af50dbb22b90ca3560be98ee 100644
--- a/src/plugins/fakevim/fakevimplugin.h
+++ b/src/plugins/fakevim/fakevimplugin.h
@@ -84,7 +84,7 @@ private slots:
     void removeHandler(QWidget *widget);
     void showCommandBuffer(const QString &contents);
     void showExtraInformation(const QString &msg);
-    void initializeConfiguaration(QHash<QString, QString> *config);
+    void initializeConfiguration(QHash<QString, QString> *config);
 
 private:
     FakeVimHandler *m_handler;