11 files changed, 15 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am
index 7711cda9..6e8b423b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,10 +6,10 @@ core_sources = \
 	src/chat_state.h src/chat_state.c \
 	src/resource.c src/resource.h \
 	src/roster_list.c src/roster_list.h \
-	src/xmpp/xmpp.h src/xmpp/capabilities.c src/xmpp/connection.c \
+	src/xmpp/xmpp.h src/xmpp/capabilities.c src/xmpp/session.c \
 	src/xmpp/iq.c src/xmpp/message.c src/xmpp/presence.c src/xmpp/stanza.c \
 	src/xmpp/stanza.h src/xmpp/message.h src/xmpp/iq.h src/xmpp/presence.h \
-	src/xmpp/capabilities.h src/xmpp/connection.h \
+	src/xmpp/capabilities.h src/xmpp/session.h \
 	src/xmpp/roster.c src/xmpp/roster.h \
 	src/xmpp/bookmark.c src/xmpp/bookmark.h \
 	src/xmpp/blocking.c src/xmpp/blocking.h \
diff --git a/src/xmpp/blocking.c b/src/xmpp/blocking.c
index c78f5452..13b20e9a 100644
--- a/src/xmpp/blocking.c
+++ b/src/xmpp/blocking.c
@@ -46,7 +46,7 @@
 #include "log.h"
 #include "common.h"
 #include "ui/ui.h"
-#include "xmpp/connection.h"
+#include "xmpp/session.h"
 #include "xmpp/stanza.h"
 #include "xmpp/iq.h"
 
diff --git a/src/xmpp/bookmark.c b/src/xmpp/bookmark.c
index c4b0e4f1..35e018f8 100644
--- a/src/xmpp/bookmark.c
+++ b/src/xmpp/bookmark.c
@@ -51,7 +51,7 @@
 #include "log.h"
 #include "muc.h"
 #include "event/server_events.h"
-#include "xmpp/connection.h"
+#include "xmpp/session.h"
 #include "xmpp/iq.h"
 #include "xmpp/stanza.h"
 #include "xmpp/xmpp.h"
diff --git a/src/xmpp/form.c b/src/xmpp/form.c
index b4005f6a..6ec7c1be 100644
--- a/src/xmpp/form.c
+++ b/src/xmpp/form.c
@@ -49,7 +49,7 @@
 #include "log.h"
 #include "xmpp/xmpp.h"
 #include "xmpp/stanza.h"
-#include "xmpp/connection.h"
+#include "xmpp/session.h"
 
 static gboolean
 _is_valid_form_element(xmpp_stanza_t *stanza)
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c
index d000defd..be45bcbf 100644
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -59,7 +59,7 @@
 #include "event/server_events.h"
 #include "xmpp/capabilities.h"
 #include "xmpp/blocking.h"
-#include "xmpp/connection.h"
+#include "xmpp/session.h"
 #include "xmpp/stanza.h"
 #include "xmpp/form.h"
 #include "roster_list.h"
diff --git a/src/xmpp/message.c b/src/xmpp/message.c
index 6d999d61..0b016380 100644
--- a/src/xmpp/message.c
+++ b/src/xmpp/message.c
@@ -51,7 +51,7 @@
 #include "profanity.h"
 #include "ui/ui.h"
 #include "event/server_events.h"
-#include "xmpp/connection.h"
+#include "xmpp/session.h"
 #include "xmpp/message.h"
 #include "xmpp/roster.h"
 #include "roster_list.h"
diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c
index 4d59326b..130a3fe9 100644
--- a/src/xmpp/presence.c
+++ b/src/xmpp/presence.c
@@ -56,7 +56,7 @@
 #include "ui/ui.h"
 #include "event/server_events.h"
 #include "xmpp/capabilities.h"
-#include "xmpp/connection.h"
+#include "xmpp/session.h"
 #include "xmpp/stanza.h"
 #include "xmpp/iq.h"
 #include "xmpp/xmpp.h"
diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c
index 0cb37014..48f97838 100644
--- a/src/xmpp/roster.c
+++ b/src/xmpp/roster.c
@@ -55,7 +55,7 @@
 #include "event/client_events.h"
 #include "tools/autocomplete.h"
 #include "config/preferences.h"
-#include "xmpp/connection.h"
+#include "xmpp/session.h"
 #include "xmpp/iq.h"
 #include "xmpp/roster.h"
 #include "roster_list.h"
diff --git a/src/xmpp/connection.c b/src/xmpp/session.c
index f76fdc14..4d0d4a46 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/session.c
@@ -1,5 +1,5 @@
 /*
- * connection.c
+ * session.c
  *
  * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
  *
@@ -57,7 +57,7 @@
 #include "xmpp/bookmark.h"
 #include "xmpp/blocking.h"
 #include "xmpp/capabilities.h"
-#include "xmpp/connection.h"
+#include "xmpp/session.h"
 #include "xmpp/iq.h"
 #include "xmpp/message.h"
 #include "xmpp/presence.h"
diff --git a/src/xmpp/connection.h b/src/xmpp/session.h
index f964aca3..556523a1 100644
--- a/src/xmpp/connection.h
+++ b/src/xmpp/session.h
@@ -1,5 +1,5 @@
 /*
- * connection.h
+ * session.h
  *
  * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
  *
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef XMPP_CONNECTION_H
-#define XMPP_CONNECTION_H
+#ifndef XMPP_SESSION_H
+#define XMPP_SESSION_H
 
 #include "config.h"
 
diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c
index 01ae3f2d..1b64fd94 100644
--- a/src/xmpp/stanza.c
+++ b/src/xmpp/stanza.c
@@ -53,7 +53,7 @@
 
 #include "common.h"
 #include "log.h"
-#include "xmpp/connection.h"
+#include "xmpp/session.h"
 #include "xmpp/stanza.h"
 #include "xmpp/capabilities.h"
 #include "xmpp/form.h"