diff --git a/data/org.gtk.teleportapp.desktop.in b/data/com.frac-tion.teleport.dektop.in
similarity index 77%
rename from data/org.gtk.teleportapp.desktop.in
rename to data/com.frac-tion.teleport.dektop.in
index 4c91478..f7f91fd 100755
--- a/data/org.gtk.teleportapp.desktop.in
+++ b/data/com.frac-tion.teleport.dektop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Teleport
 Exec=teleportapp
-Icon=org.gtk.teleportapp
+Icon=com.frac-tion.teleport
 Type=Application
 Categories=GTK;GNOME;Utility;
diff --git a/data/org.gtk.teleportapp.gschema.xml b/data/com.frac-tion.teleport.gschema.xml
similarity index 91%
rename from data/org.gtk.teleportapp.gschema.xml
rename to data/com.frac-tion.teleport.gschema.xml
index 743a07d..db2d361 100644
--- a/data/org.gtk.teleportapp.gschema.xml
+++ b/data/com.frac-tion.teleport.gschema.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <schema path="/org/gtk/teleportapp/" id="org.gtk.teleportapp">
+  <schema path="/com/frac-tion/teleport/" id="com.frac-tion.teleport">
     <key name="font" type="s">
       <default>'Monospace 12'</default>
       <summary>Font</summary>
diff --git a/data/meson.build b/data/meson.build
index 76dd362..5609d63 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,4 +1,4 @@
-desktop = 'org.gtk.teleportapp.desktop'
+desktop = 'com.frac-tion.teleport.desktop'
 
 i18n.merge_file(
   desktop,
@@ -24,7 +24,7 @@ i18n.merge_file(
 #)
 
 install_data(
-  'org.gtk.teleportapp.gschema.xml',
+  'com.frac-tion.teleport.gschema.xml',
   install_dir: teleportapp_schemadir
 )
 
diff --git a/data/teleportapp.gresource.xml b/data/teleportapp.gresource.xml
index fd71213..3d045c0 100644
--- a/data/teleportapp.gresource.xml
+++ b/data/teleportapp.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gtk/teleportapp">
+  <gresource prefix="/com/frac-tion/teleport">
     <file preprocess="xml-stripblanks">window.ui</file>
     <file preprocess="xml-stripblanks">settings.ui</file>
     <file preprocess="xml-stripblanks">remote_list.ui</file>
diff --git a/src/teleportapp.c b/src/teleportapp.c
index c0bb790..c2dcbb6 100644
--- a/src/teleportapp.c
+++ b/src/teleportapp.c
@@ -214,7 +214,7 @@ teleport_app_class_init (TeleportAppClass *class)
 teleport_app_new (void)
 {
   return g_object_new (TELEPORT_APP_TYPE,
-      "application-id", "org.gtk.teleportapp",
+      "application-id", "com.frac-tion.teleport",
       "flags", G_APPLICATION_HANDLES_OPEN,
       NULL);
 }
diff --git a/src/teleportappwin.c b/src/teleportappwin.c
index 7f8c4a4..7991004 100644
--- a/src/teleportappwin.c
+++ b/src/teleportappwin.c
@@ -38,7 +38,7 @@ teleport_app_window_init (TeleportAppWindow *win)
 
   gtk_widget_init_template (GTK_WIDGET (win));
 
-  builder = gtk_builder_new_from_resource ("/org/gtk/teleportapp/settings.ui");
+  builder = gtk_builder_new_from_resource ("/com/frac-tion/teleport/settings.ui");
   menu = GTK_WIDGET (gtk_builder_get_object (builder, "settings"));
   downloadDir = GTK_ENTRY (gtk_builder_get_object (builder, "settings_download_directory"));
 
@@ -60,7 +60,7 @@ open_file_picker(GtkButton *btn, Peer *device) {
   gint res;
   g_print("Open file chooser for submitting a file to %s with Address %s\n", device->name, device->ip);
 
-  dialog = gtk_file_chooser_dialog_new ("Open File",
+  dialog =  ("Open File",
       GTK_WINDOW(mainWin),
       action,
       ("_Cancel"),
@@ -96,7 +96,7 @@ void update_remote_device_list(TeleportAppWindow *win, Peer *device) {
 
   priv = teleport_app_window_get_instance_private (win);
 
-  builder_remote_list = gtk_builder_new_from_resource ("/org/gtk/teleportapp/remote_list.ui");
+  builder_remote_list = gtk_builder_new_from_resource ("/com/frac-tion/teleport/remote_list.ui");
 
   row = GTK_WIDGET (gtk_builder_get_object (builder_remote_list, "remote_device_row"));
   name_label = GTK_LABEL (gtk_builder_get_object (builder_remote_list, "device_name"));
@@ -180,7 +180,7 @@ teleport_app_window_class_init (TeleportAppWindowClass *class)
   G_OBJECT_CLASS (class)->dispose = teleport_app_window_dispose;
 
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
-      "/org/gtk/teleportapp/window.ui");
+      "/com/frac-tion/teleport/window.ui");
 
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), TeleportAppWindow, gears);
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), TeleportAppWindow, this_device_name_label);