diff --git a/src/plugins/remotelinux/CMakeLists.txt b/src/plugins/remotelinux/CMakeLists.txt
index 7111f55b767..a29886139c0 100644
--- a/src/plugins/remotelinux/CMakeLists.txt
+++ b/src/plugins/remotelinux/CMakeLists.txt
@@ -33,12 +33,12 @@ add_qtc_plugin(RemoteLinux
     remotelinuxqmltoolingsupport.cpp remotelinuxqmltoolingsupport.h
     remotelinuxrunconfiguration.cpp remotelinuxrunconfiguration.h
     remotelinuxsignaloperation.cpp remotelinuxsignaloperation.h
-    remotelinuxx11forwardingaspect.cpp remotelinuxx11forwardingaspect.h
     rsyncdeploystep.cpp rsyncdeploystep.h
     sshkeycreationdialog.cpp sshkeycreationdialog.h sshkeycreationdialog.ui
     sshprocessinterface.h
     tarpackagecreationstep.cpp tarpackagecreationstep.h
     tarpackagedeploystep.cpp tarpackagedeploystep.h
+    x11forwardingaspect.cpp x11forwardingaspect.h
 )
 
 extend_qtc_plugin(RemoteLinux
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index 15170415cf4..cdaf40f11a5 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -71,8 +71,6 @@ Project {
             "remotelinuxrunconfiguration.h",
             "remotelinuxsignaloperation.cpp",
             "remotelinuxsignaloperation.h",
-            "remotelinuxx11forwardingaspect.cpp",
-            "remotelinuxx11forwardingaspect.h",
             "rsyncdeploystep.cpp",
             "rsyncdeploystep.h",
             "sshkeycreationdialog.cpp",
@@ -83,6 +81,8 @@ Project {
             "tarpackagecreationstep.h",
             "tarpackagedeploystep.cpp",
             "tarpackagedeploystep.h",
+            "x11forwardingaspect.cpp",
+            "x11forwardingaspect.h",
             "images/embeddedtarget.png",
         ]
 
diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
index 6009c502696..fe704f0705b 100644
--- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
@@ -27,7 +27,7 @@
 
 #include "remotelinux_constants.h"
 #include "remotelinuxenvironmentaspect.h"
-#include "remotelinuxx11forwardingaspect.h"
+#include "x11forwardingaspect.h"
 
 #include <projectexplorer/runconfigurationaspects.h>
 #include <projectexplorer/runcontrol.h>
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 44d1c677281..cc026da4db1 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -26,8 +26,8 @@
 #include "remotelinuxrunconfiguration.h"
 
 #include "remotelinux_constants.h"
-#include "remotelinuxx11forwardingaspect.h"
 #include "remotelinuxenvironmentaspect.h"
+#include "x11forwardingaspect.h"
 
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/buildtargetinfo.h>
diff --git a/src/plugins/remotelinux/remotelinuxx11forwardingaspect.cpp b/src/plugins/remotelinux/x11forwardingaspect.cpp
similarity index 97%
rename from src/plugins/remotelinux/remotelinuxx11forwardingaspect.cpp
rename to src/plugins/remotelinux/x11forwardingaspect.cpp
index 3fbeba70cc1..952170a8224 100644
--- a/src/plugins/remotelinux/remotelinuxx11forwardingaspect.cpp
+++ b/src/plugins/remotelinux/x11forwardingaspect.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "remotelinuxx11forwardingaspect.h"
+#include "x11forwardingaspect.h"
 
 #include <utils/macroexpander.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/remotelinux/remotelinuxx11forwardingaspect.h b/src/plugins/remotelinux/x11forwardingaspect.h
similarity index 100%
rename from src/plugins/remotelinux/remotelinuxx11forwardingaspect.h
rename to src/plugins/remotelinux/x11forwardingaspect.h