diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 if (Qt5Quick_FOUND AND Qt5Widgets_FOUND)
     set(elisa_SOURCES
-        upnpControl.cpp
+        main.cpp
         mediaplaylist.cpp
         musicstatistics.cpp
         musicalbum.cpp
@@ -30,7 +30,7 @@
         file/filelistener.cpp
         file/localfilelisting.cpp
 
-        MediaServer.qml
+        ElisaMainWindow.qml
         Theme.qml
         PlatformIntegration.qml
         LabelWithToolTip.qml
@@ -115,7 +115,7 @@
         elisa_core.kcfg
     )
 
-    qt5_add_resources(elisa_SOURCES upnpControl.qrc)
+    qt5_add_resources(elisa_SOURCES resources.qrc)
 
     set(elisa_ICONS_PNG
         ../icons/128-apps-elisa.png
diff --git a/src/MediaServer.qml b/src/ElisaMainWindow.qml
rename from src/MediaServer.qml
rename to src/ElisaMainWindow.qml
diff --git a/src/upnpControl.cpp b/src/main.cpp
rename from src/upnpControl.cpp
rename to src/main.cpp
--- a/src/upnpControl.cpp
+++ b/src/main.cpp
@@ -243,7 +243,7 @@
     engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
     engine.rootContext()->setContextProperty(QStringLiteral("elisa"), &myApp);
 
-    engine.load(QUrl(QStringLiteral("qrc:/MediaServer.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:/ElisaMainWindow.qml")));
 
     return app.exec();
 }
diff --git a/src/upnpControl.qrc b/src/resources.qrc
rename from src/upnpControl.qrc
rename to src/resources.qrc
--- a/src/upnpControl.qrc
+++ b/src/resources.qrc
@@ -4,7 +4,7 @@
         <file>RatingStar.qml</file>
         <file>MediaPlayListView.qml</file>
         <file>MediaAlbumView.qml</file>
-        <file>MediaServer.qml</file>
+        <file>ElisaMainWindow.qml</file>
         <file>HeaderBar.qml</file>
         <file>ContextView.qml</file>
         <file>DraggableItem.qml</file>