diff --git a/resources/qml/EncryptionIndicator.qml b/resources/qml/EncryptionIndicator.qml
index 2cd9161b..905cf934 100644
--- a/resources/qml/EncryptionIndicator.qml
+++ b/resources/qml/EncryptionIndicator.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.5
 import QtQuick.Controls 2.1
-import com.github.nheko 1.0
+import im.nheko 1.0
 
 Rectangle {
 	id: indicator
diff --git a/resources/qml/StatusIndicator.qml b/resources/qml/StatusIndicator.qml
index 2ed59a17..91e8f769 100644
--- a/resources/qml/StatusIndicator.qml
+++ b/resources/qml/StatusIndicator.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.5
 import QtQuick.Controls 2.1
-import com.github.nheko 1.0
+import im.nheko 1.0
 
 Rectangle {
 	id: indicator
diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
index a2d4fca5..4917e893 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -3,7 +3,7 @@ import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.2
 import QtQuick.Window 2.2
 
-import com.github.nheko 1.0
+import im.nheko 1.0
 
 import "./delegates"
 
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index a5520031..b97af0dd 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.2
 import QtGraphicalEffects 1.0
 import QtQuick.Window 2.2
 
-import com.github.nheko 1.0
+import im.nheko 1.0
 
 import "./delegates"
 
diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml
index 802ef721..a1a06012 100644
--- a/resources/qml/delegates/ImageMessage.qml
+++ b/resources/qml/delegates/ImageMessage.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.6
 
-import com.github.nheko 1.0
+import im.nheko 1.0
 
 Item {
 	width: Math.min(parent ? parent.width : undefined, model.width)
diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml
index e31321f9..178dfd86 100644
--- a/resources/qml/delegates/MessageDelegate.qml
+++ b/resources/qml/delegates/MessageDelegate.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.6
-import com.github.nheko 1.0
+import im.nheko 1.0
 
 DelegateChooser {
 	//role: "type" //< not supported in our custom implementation, have to use roleValue
diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
index 1207ac77..3b987545 100644
--- a/resources/qml/delegates/PlayableMediaMessage.qml
+++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -3,7 +3,7 @@ import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.1
 import QtMultimedia 5.6
 
-import com.github.nheko 1.0
+import im.nheko 1.0
 
 Rectangle {
 	id: bg
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index 39bdfcf4..2a88c882 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -55,13 +55,13 @@ TimelineViewManager::TimelineViewManager(QWidget *parent)
   , colorImgProvider(new ColorImageProvider())
 {
         qmlRegisterUncreatableMetaObject(qml_mtx_events::staticMetaObject,
-                                         "com.github.nheko",
+                                         "im.nheko",
                                          1,
                                          0,
                                          "MtxEvent",
                                          "Can't instantiate enum!");
-        qmlRegisterType<DelegateChoice>("com.github.nheko", 1, 0, "DelegateChoice");
-        qmlRegisterType<DelegateChooser>("com.github.nheko", 1, 0, "DelegateChooser");
+        qmlRegisterType<DelegateChoice>("im.nheko", 1, 0, "DelegateChoice");
+        qmlRegisterType<DelegateChooser>("im.nheko", 1, 0, "DelegateChooser");
 
 #ifdef USE_QUICK_VIEW
         view      = new QQuickView();