diff --git a/SailTime.pro b/SailTime.pro
index b6c3d56..03ad025 100644
--- a/SailTime.pro
+++ b/SailTime.pro
@@ -6,22 +6,23 @@
 #         - desktop icon filename must be changed
 #         - desktop filename must be changed
 #         - icon definition filename in desktop file must be changed
-TARGET = SailTime
+TARGET = harbour-sailtime
 
 CONFIG += sailfishapp
 
 SOURCES += src/SailTime.cpp \
     src/uptimechecker.cpp
 
-OTHER_FILES += qml/SailTime.qml \
+OTHER_FILES += \
     qml/cover/CoverPage.qml \
     qml/pages/FirstPage.qml \
     qml/pages/SecondPage.qml \
     rpm/SailTime.spec \
     rpm/SailTime.yaml \
-    SailTime.desktop \
     qml/js/storage.js \
-    qml/js/uptime.js
+    qml/js/uptime.js \
+    harbour-sailtime.desktop \
+    qml/harbour-sailtime.qml
 
 HEADERS += \
     src/uptimechecker.h
diff --git a/SailTime.desktop b/harbour-sailtime.desktop
similarity index 54%
rename from SailTime.desktop
rename to harbour-sailtime.desktop
index 880f43c..3ff1a9d 100644
--- a/SailTime.desktop
+++ b/harbour-sailtime.desktop
@@ -2,6 +2,6 @@
 Type=Application
 X-Nemo-Application-Type=silica-qt5
 Name=SailTime
-Icon=/usr/share/icons/hicolor/90x90/apps/SailTime.png
-Exec=SailTime
+Icon=harbour-sailtime
+Exec=harbour-sailtime
 
diff --git a/qml/SailTime.qml b/qml/harbour-sailtime.qml
similarity index 97%
rename from qml/SailTime.qml
rename to qml/harbour-sailtime.qml
index e589fd6..ebea5cf 100644
--- a/qml/SailTime.qml
+++ b/qml/harbour-sailtime.qml
@@ -2,7 +2,7 @@
 
 import QtQuick 2.0
 import Sailfish.Silica 1.0
-import net.nytsoi.sailfish.sailtime.components 1.0
+import harbour.sailtime.UptimeChecker 1.0
 import "cover"
 import "pages"
 
diff --git a/rpm/SailTime.spec b/rpm/SailTime.spec
index f564a8a..b1adc98 100644
--- a/rpm/SailTime.spec
+++ b/rpm/SailTime.spec
@@ -20,10 +20,10 @@ License:    LICENSE
 Source0:    %{name}-%{version}.tar.bz2
 Source100:  SailTime.yaml
 Requires:   sailfishsilica-qt5
-BuildRequires:  pkgconfig(sailfishapp)
-BuildRequires:  pkgconfig(Qt5Quick)
-BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5Qml)
+BuildRequires:  pkgconfig(Qt5Quick)
+BuildRequires:  pkgconfig(sailfishapp)
 BuildRequires:  desktop-file-utils
 
 %description
@@ -62,13 +62,14 @@ desktop-file-install --delete-original       \
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}
-%{_datadir}/%{name}/qml
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/90x90/apps/%{name}.png
-/usr/bin
-/usr/share/SailTime
-/usr/share/applications
+/usr/share/harbour-sailtime
 /usr/share/icons/hicolor/90x90/apps
+/usr/share/applications
+/usr/share/SailTime
+/usr/bin
+%{_datadir}/icons/hicolor/90x90/apps/%{name}.png
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}/qml
+%{_bindir}
 # >> files
 # << files
diff --git a/rpm/SailTime.yaml b/rpm/SailTime.yaml
index 8942996..451c516 100644
--- a/rpm/SailTime.yaml
+++ b/rpm/SailTime.yaml
@@ -11,19 +11,20 @@ Description: |
 Configure: none
 Builder: qtc5
 PkgConfigBR:
-- sailfishapp
-- Qt5Quick
-- Qt5Qml
 - Qt5Core
+- Qt5Qml
+- Qt5Quick
+- sailfishapp
 Requires:
 - sailfishsilica-qt5
 Files:
-- '%{_bindir}'
-- '%{_datadir}/%{name}/qml'
-- '%{_datadir}/applications/%{name}.desktop'
-- '%{_datadir}/icons/hicolor/90x90/apps/%{name}.png'
-- /usr/bin
-- /usr/share/SailTime
-- /usr/share/applications
+- /usr/share/harbour-sailtime
 - /usr/share/icons/hicolor/90x90/apps
+- /usr/share/applications
+- /usr/share/SailTime
+- /usr/bin
+- '%{_datadir}/icons/hicolor/90x90/apps/%{name}.png'
+- '%{_datadir}/applications/%{name}.desktop'
+- '%{_datadir}/%{name}/qml'
+- '%{_bindir}'
 PkgBR: []
diff --git a/src/SailTime.cpp b/src/SailTime.cpp
index cd7daaa..4f751d0 100644
--- a/src/SailTime.cpp
+++ b/src/SailTime.cpp
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
     //
     // To display the view, call "show()" (will show fullscreen on device).
 
-    qmlRegisterType<UptimeChecker>("net.nytsoi.sailfish.sailtime.components", 1, 0, "UptimeChecker");
+    qmlRegisterType<UptimeChecker>("harbour.sailtime.UptimeChecker", 1, 0, "UptimeChecker");
     return SailfishApp::main(argc, argv);
 }