diff --git a/src/main.c b/src/main.c
index 74282fb..68f8120 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 #include <gtk/gtk.h>
 
-#include "teleport.h"
+#include "teleport-app.h"
 
 int
 main (int argc, char *argv[])
diff --git a/src/meson.build b/src/meson.build
index f247ab8..efb6803 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -6,7 +6,7 @@ headers = files(
   'teleport-server.h',
   'teleport-window.h',
   'teleport-peer.h',
-  'teleport.h'
+  'teleport-app.h'
 )
 
 install_headers(headers, subdir: meson.project_name())
@@ -21,7 +21,7 @@ sources = files(
   'teleport-get.c',
   'teleport-publish.c',
   'teleport-server.c',
-  'teleport.c',
+  'teleport-app.c',
   'teleport-window.c',
   'teleport-peer.c',
   'main.c'
diff --git a/src/teleport.c b/src/teleport-app.c
similarity index 99%
rename from src/teleport.c
rename to src/teleport-app.c
index c175fc0..1c46e1d 100644
--- a/src/teleport.c
+++ b/src/teleport-app.c
@@ -1,6 +1,6 @@
 #include <gtk/gtk.h>
 
-#include "teleport.h"
+#include "teleport-app.h"
 #include "teleport-peer.h"
 #include "teleport-window.h"
 #include "teleport-browser.h"
diff --git a/src/teleport.h b/src/teleport-app.h
similarity index 73%
rename from src/teleport.h
rename to src/teleport-app.h
index de10b79..c74fd14 100644
--- a/src/teleport.h
+++ b/src/teleport-app.h
@@ -1,5 +1,5 @@
-#ifndef __TELEPORT_H
-#define __TELEPORT_H
+#ifndef __TELEPORT_APP_H
+#define __TELEPORT_APP_H
 
 #include <gtk/gtk.h>
 #include "teleport-peer.h"
@@ -8,11 +8,11 @@
 G_DECLARE_FINAL_TYPE (TeleportApp, teleport_app, TELEPORT, APP, GtkApplication)
 
 
-TeleportApp     *teleport_app_new             (void);
-extern void     create_user_notification      (const char *,
-                                               const int,
-                                               const char *,
-                                               GVariant *);
+TeleportApp     *teleport_app_new            (void);
+extern void     create_user_notification     (const char *,
+                                              const int,
+                                              const char *,
+                                              GVariant *);
 
 extern void     create_finished_notification (const char *,
                                               const int,
@@ -33,4 +33,4 @@ void            callback_notify_user         (GObject *,
                                               gpointer);
 
 
-#endif /* __TELEPORT_H */
+#endif /* __TELEPORT_APP_H */
diff --git a/src/teleport-browser.c b/src/teleport-browser.c
index 8ac3303..99d4bc8 100644
--- a/src/teleport-browser.c
+++ b/src/teleport-browser.c
@@ -13,7 +13,7 @@
 #include <avahi-common/error.h>
 #include <avahi-common/thread-watch.h>
 
-#include "teleport.h"
+#include "teleport-app.h"
 #include "teleport-peer.h"
 #include "teleport-browser.h"
 
diff --git a/src/teleport-get.c b/src/teleport-get.c
index 0b392ff..25d10aa 100644
--- a/src/teleport-get.c
+++ b/src/teleport-get.c
@@ -7,7 +7,7 @@
 #include <string.h>
 
 #include <libsoup/soup.h>
-#include "teleport.h"
+#include "teleport-app.h"
 #include "teleport-get.h"
 
 static gboolean debug;
diff --git a/src/teleport-publish.c b/src/teleport-publish.c
index bfbf082..8a095bc 100644
--- a/src/teleport-publish.c
+++ b/src/teleport-publish.c
@@ -17,7 +17,7 @@
 #include <avahi-common/timeval.h>
 #include <avahi-common/thread-watch.h>
 
-#include "teleport.h"
+#include "teleport-app.h"
 #include "teleport-peer.h"
 #include "teleport-publish.h"
 
diff --git a/src/teleport-server.c b/src/teleport-server.c
index d53aa99..dedf35f 100644
--- a/src/teleport-server.c
+++ b/src/teleport-server.c
@@ -9,7 +9,7 @@
 
 #include "teleport-get.h"
 #include "teleport-server.h"
-#include "teleport.h"
+#include "teleport-app.h"
 
 static int port;
 static SoupServer *glob_server;
diff --git a/src/teleport-window.c b/src/teleport-window.c
index 4fde455..1f523c7 100644
--- a/src/teleport-window.c
+++ b/src/teleport-window.c
@@ -1,6 +1,6 @@
 #include <gtk/gtk.h>
 
-#include "teleport.h"
+#include "teleport-app.h"
 #include "teleport-window.h"
 #include "teleport-server.h"
 #include "teleport-peer.h"
diff --git a/src/teleport-window.h b/src/teleport-window.h
index cb3dbb1..3288e28 100644
--- a/src/teleport-window.h
+++ b/src/teleport-window.h
@@ -2,7 +2,7 @@
 #define __TELEPORT_WINDOW_H
 
 #include <gtk/gtk.h>
-#include "teleport.h"
+#include "teleport-app.h"
 #include "teleport-peer.h"