diff --git a/app/lattecorona.cpp b/app/lattecorona.cpp
index 91d25ebc1..06e2861ad 100644
--- a/app/lattecorona.cpp
+++ b/app/lattecorona.cpp
@@ -47,7 +47,7 @@
 #include "wm/xwindowinterface.h"
 #include "wm/tracker/lastactivewindow.h"
 #include "wm/tracker/schemes.h"
-#include "wm/tracker/trackerwindows.h"
+#include "wm/tracker/windowstracker.h"
 
 // Qt
 #include <QAction>
diff --git a/app/view/windowstracker/allscreenstracker.cpp b/app/view/windowstracker/allscreenstracker.cpp
index 043194982..881cc43d4 100644
--- a/app/view/windowstracker/allscreenstracker.cpp
+++ b/app/view/windowstracker/allscreenstracker.cpp
@@ -24,7 +24,7 @@
 #include "../../layout/genericlayout.h"
 #include "../../wm/schemecolors.h"
 #include "../../wm/tracker/lastactivewindow.h"
-#include "../../wm/tracker/trackerwindows.h"
+#include "../../wm/tracker/windowstracker.h"
 
 namespace Latte {
 namespace ViewPart {
diff --git a/app/view/windowstracker/currentscreentracker.cpp b/app/view/windowstracker/currentscreentracker.cpp
index c8c026073..de9464ccd 100644
--- a/app/view/windowstracker/currentscreentracker.cpp
+++ b/app/view/windowstracker/currentscreentracker.cpp
@@ -23,7 +23,7 @@
 #include "../view.h"
 #include "../../wm/schemecolors.h"
 #include "../../wm/tracker/lastactivewindow.h"
-#include "../../wm/tracker/trackerwindows.h"
+#include "../../wm/tracker/windowstracker.h"
 
 namespace Latte {
 namespace ViewPart {
diff --git a/app/view/windowstracker/windowstracker.cpp b/app/view/windowstracker/windowstracker.cpp
index 91042abec..676804b27 100644
--- a/app/view/windowstracker/windowstracker.cpp
+++ b/app/view/windowstracker/windowstracker.cpp
@@ -24,7 +24,7 @@
 #include "allscreenstracker.h"
 #include "../view.h"
 #include "../../lattecorona.h"
-#include "../../wm/tracker/trackerwindows.h"
+#include "../../wm/tracker/windowstracker.h"
 
 
 namespace Latte {
diff --git a/app/wm/abstractwindowinterface.cpp b/app/wm/abstractwindowinterface.cpp
index 11c0b9b16..224adc122 100644
--- a/app/wm/abstractwindowinterface.cpp
+++ b/app/wm/abstractwindowinterface.cpp
@@ -22,7 +22,7 @@
 
 // local
 #include "tracker/schemes.h"
-#include "tracker/trackerwindows.h"
+#include "tracker/windowstracker.h"
 #include "../lattecorona.h"
 
 // Qt
diff --git a/app/wm/abstractwindowinterface.h b/app/wm/abstractwindowinterface.h
index 9abf1753e..3f1bf2481 100644
--- a/app/wm/abstractwindowinterface.h
+++ b/app/wm/abstractwindowinterface.h
@@ -25,7 +25,7 @@
 #include "schemecolors.h"
 #include "tasktools.h"
 #include "windowinfowrap.h"
-#include "tracker/trackerwindows.h"
+#include "tracker/windowstracker.h"
 #include "../liblatte2/types.h"
 #include "../liblatte2/extras.h"
 
diff --git a/app/wm/tracker/CMakeLists.txt b/app/wm/tracker/CMakeLists.txt
index 6157f76df..b8e9219d5 100644
--- a/app/wm/tracker/CMakeLists.txt
+++ b/app/wm/tracker/CMakeLists.txt
@@ -5,6 +5,6 @@ set(lattedock-app_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/trackedgeneralinfo.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/trackedlayoutinfo.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/trackedviewinfo.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/trackerwindows.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/windowstracker.cpp
     PARENT_SCOPE
 )
diff --git a/app/wm/tracker/lastactivewindow.cpp b/app/wm/tracker/lastactivewindow.cpp
index 03bf0e7e9..e4a5eab0b 100644
--- a/app/wm/tracker/lastactivewindow.cpp
+++ b/app/wm/tracker/lastactivewindow.cpp
@@ -21,7 +21,7 @@
 
 // local
 #include "trackedgeneralinfo.h"
-#include "trackerwindows.h"
+#include "windowstracker.h"
 #include "../abstractwindowinterface.h"
 #include "../tasktools.h"
 #include "../../view/view.h"
diff --git a/app/wm/tracker/trackedgeneralinfo.cpp b/app/wm/tracker/trackedgeneralinfo.cpp
index 9b321168d..2122a5c33 100644
--- a/app/wm/tracker/trackedgeneralinfo.cpp
+++ b/app/wm/tracker/trackedgeneralinfo.cpp
@@ -20,7 +20,7 @@
 #include "trackedgeneralinfo.h"
 
 //local
-#include "trackerwindows.h"
+#include "windowstracker.h"
 #include "../abstractwindowinterface.h"
 #include "../schemecolors.h"
 
diff --git a/app/wm/tracker/trackedlayoutinfo.cpp b/app/wm/tracker/trackedlayoutinfo.cpp
index 69c6e82fa..ea53986c8 100644
--- a/app/wm/tracker/trackedlayoutinfo.cpp
+++ b/app/wm/tracker/trackedlayoutinfo.cpp
@@ -20,7 +20,7 @@
 #include "trackedlayoutinfo.h"
 
 //local
-#include "trackerwindows.h"
+#include "windowstracker.h"
 #include "../../layout/genericlayout.h"
 
 namespace Latte {
diff --git a/app/wm/tracker/trackedviewinfo.cpp b/app/wm/tracker/trackedviewinfo.cpp
index 547e330e8..6a60213c3 100644
--- a/app/wm/tracker/trackedviewinfo.cpp
+++ b/app/wm/tracker/trackedviewinfo.cpp
@@ -20,7 +20,7 @@
 #include "trackedviewinfo.h"
 
 //local
-#include "trackerwindows.h"
+#include "windowstracker.h"
 #include "../schemecolors.h"
 #include "../../view/view.h"
 
diff --git a/app/wm/tracker/trackerwindows.cpp b/app/wm/tracker/windowstracker.cpp
similarity index 99%
rename from app/wm/tracker/trackerwindows.cpp
rename to app/wm/tracker/windowstracker.cpp
index efed57c9e..60266e30b 100644
--- a/app/wm/tracker/trackerwindows.cpp
+++ b/app/wm/tracker/windowstracker.cpp
@@ -17,7 +17,7 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "trackerwindows.h"
+#include "windowstracker.h"
 
 // local
 #include "lastactivewindow.h"
diff --git a/app/wm/tracker/trackerwindows.h b/app/wm/tracker/windowstracker.h
similarity index 100%
rename from app/wm/tracker/trackerwindows.h
rename to app/wm/tracker/windowstracker.h