diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index f7e327d17..8663fb4ea 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -3,14 +3,14 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 set(QBT_APP_HEADERS
 application.h
+cmdoptions.h
 filelogger.h
-options.h
 )
 
 set(QBT_APP_SOURCES
 application.cpp
+cmdoptions.cpp
 filelogger.cpp
-options.cpp
 main.cpp
 )
 
diff --git a/src/app/app.pri b/src/app/app.pri
index c89127e63..8c8c7d870 100644
--- a/src/app/app.pri
+++ b/src/app/app.pri
@@ -16,13 +16,13 @@ usesystemqtsingleapplication {
 
 HEADERS += \
     $$PWD/application.h \
-    $$PWD/filelogger.h \
-    $$PWD/options.h
+    $$PWD/cmdoptions.h \
+    $$PWD/filelogger.h
 
 SOURCES += \
     $$PWD/application.cpp \
+    $$PWD/cmdoptions.cpp \
     $$PWD/filelogger.cpp \
-    $$PWD/options.cpp \
     $$PWD/main.cpp
 
 unix: HEADERS += $$PWD/stacktrace.h
diff --git a/src/app/application.h b/src/app/application.h
index 313bcfa4a..f698a5e54 100644
--- a/src/app/application.h
+++ b/src/app/application.h
@@ -51,7 +51,7 @@ typedef QtSingleCoreApplication BaseApplication;
 #endif
 
 #include "base/utils/misc.h"
-#include "options.h"
+#include "cmdoptions.h"
 
 #ifndef DISABLE_WEBUI
 class WebUI;
diff --git a/src/app/options.cpp b/src/app/cmdoptions.cpp
similarity index 99%
rename from src/app/options.cpp
rename to src/app/cmdoptions.cpp
index c8addae45..c3fa354c9 100644
--- a/src/app/options.cpp
+++ b/src/app/cmdoptions.cpp
@@ -30,7 +30,7 @@
  * Contact : chris@qbittorrent.org
  */
 
-#include "options.h"
+#include "cmdoptions.h"
 
 #include <iostream>
 
diff --git a/src/app/options.h b/src/app/cmdoptions.h
similarity index 100%
rename from src/app/options.h
rename to src/app/cmdoptions.h
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 8143b4a0c..4e6bd186f 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -69,11 +69,12 @@ Q_IMPORT_PLUGIN(QICOPlugin)
 
 #include <cstdlib>
 #include <iostream>
+
 #include "application.h"
-#include "options.h"
 #include "base/profile.h"
 #include "base/utils/misc.h"
 #include "base/preferences.h"
+#include "cmdoptions.h"
 
 #include "upgrade.h"