diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp
index 7930ea512..2b98b4a44 100644
--- a/src/lib/app/browserwindow.cpp
+++ b/src/lib/app/browserwindow.cpp
@@ -1881,7 +1881,7 @@ void BrowserWindow::resizeEvent(QResizeEvent* event)
 
 void BrowserWindow::keyPressEvent(QKeyEvent* event)
 {
-    if (mApp->plugins()->processKeyPress(Qz::ON_QupZilla, this, event)) {
+    if (mApp->plugins()->processKeyPress(Qz::ON_BrowserWindow, this, event)) {
         return;
     }
 
@@ -2061,7 +2061,7 @@ void BrowserWindow::keyPressEvent(QKeyEvent* event)
 
 void BrowserWindow::keyReleaseEvent(QKeyEvent* event)
 {
-    if (mApp->plugins()->processKeyRelease(Qz::ON_QupZilla, this, event)) {
+    if (mApp->plugins()->processKeyRelease(Qz::ON_BrowserWindow, this, event)) {
         return;
     }
 
diff --git a/src/lib/app/qz_namespace.h b/src/lib/app/qz_namespace.h
index e2a8f4756..3831ee237 100644
--- a/src/lib/app/qz_namespace.h
+++ b/src/lib/app/qz_namespace.h
@@ -90,7 +90,7 @@ enum CommandLineAction {
 enum ObjectName {
     ON_WebView,
     ON_TabBar,
-    ON_QupZilla
+    ON_BrowserWindow
 };
 
 enum NewTabPositionFlag {
diff --git a/src/lib/autofill/autofill.h b/src/lib/autofill/autofill.h
index c7b17779a..c68fcd1c6 100644
--- a/src/lib/autofill/autofill.h
+++ b/src/lib/autofill/autofill.h
@@ -15,8 +15,8 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
-#ifndef AUTOFILLMODEL_H
-#define AUTOFILLMODEL_H
+#ifndef AUTOFILL_H
+#define AUTOFILL_H
 
 #include <QObject>
 
@@ -72,4 +72,4 @@ private:
 
 };
 
-#endif // AUTOFILLMODEL_H
+#endif // AUTOFILL_H