diff --git a/.gitignore b/.gitignore
index 5ddec7d..eff650f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,6 @@ src/.deps/
 src/.dirstamp
 src/server/parser.lo
 src/server/server.lo
-src/server/stanza.lo
 src/server/xmppclient.lo
 src/client/.dirstamp
 src/client/stabber.lo
@@ -44,5 +43,6 @@ src/server/prime.lo
 src/server/verify.lo
 src/server/httpapi.lo
 src/server/stream_parser.lo
+src/server/stanzas.lo
 
 stabbertest
diff --git a/Makefile.am b/Makefile.am
index aeb5230..4a3707a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ sources = \
 	src/server/xmppclient.c src/server/xmppclient.h \
 	src/server/stream_parser.c src/server/stream_parser.h \
 	src/server/parser.c src/server/parser.h \
-    src/server/stanza.c src/server/stanza.h \
+    src/server/stanzas.c src/server/stanzas.h \
     src/server/log.c src/server/log.h \
     src/server/prime.c src/server/prime.h \
     src/server/verify.c src/server/verify.h \
diff --git a/src/server/parser.c b/src/server/parser.c
index 086e7db..f6dd37d 100644
--- a/src/server/parser.c
+++ b/src/server/parser.c
@@ -24,7 +24,7 @@
 #include <expat.h>
 #include <glib.h>
 
-#include "server/stanza.h"
+#include "server/stanzas.h"
 
 typedef struct parse_state_t {
     int depth;
diff --git a/src/server/parser.h b/src/server/parser.h
index ae4593b..b1bd2de 100644
--- a/src/server/parser.h
+++ b/src/server/parser.h
@@ -23,7 +23,7 @@
 #ifndef __H_PARSER
 #define __H_PARSER
 
-#include "server/stanza.h"
+#include "server/stanzas.h"
 
 XMPPStanza* parse_stanza(char *stanza_text);
 
diff --git a/src/server/prime.c b/src/server/prime.c
index a7995e4..8a641d6 100644
--- a/src/server/prime.c
+++ b/src/server/prime.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#include "server/stanza.h"
+#include "server/stanzas.h"
 #include "server/parser.h"
 
 static char *required_passwd = NULL;
diff --git a/src/server/prime.h b/src/server/prime.h
index 5c5c7ac..a3769a7 100644
--- a/src/server/prime.h
+++ b/src/server/prime.h
@@ -23,7 +23,7 @@
 #ifndef __H_PRIME
 #define __H_PRIME
 
-#include "server/stanza.h"
+#include "server/stanzas.h"
 
 void prime_init(void);
 void prime_free_all(void);
diff --git a/src/server/server.c b/src/server/server.c
index 044dd07..f2a78a8 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -31,7 +31,7 @@
 #include "server/xmppclient.h"
 #include "server/stream_parser.h"
 #include "server/prime.h"
-#include "server/stanza.h"
+#include "server/stanzas.h"
 #include "server/verify.h"
 #include "server/server.h"
 #include "server/httpapi.h"
diff --git a/src/server/stanza.c b/src/server/stanzas.c
similarity index 99%
rename from src/server/stanza.c
rename to src/server/stanzas.c
index c345016..ef9a25f 100644
--- a/src/server/stanza.c
+++ b/src/server/stanzas.c
@@ -1,5 +1,5 @@
 /*
- * stanza.c
+ * stanzas.c
  *
  * Copyright (C) 2015 James Booth <boothj5@gmail.com>
  *
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <glib.h>
 
-#include "server/stanza.h"
+#include "server/stanzas.h"
 #include "server/log.h"
 
 pthread_mutex_t stanzas_lock;
diff --git a/src/server/stanza.h b/src/server/stanzas.h
similarity index 97%
rename from src/server/stanza.h
rename to src/server/stanzas.h
index ea6b320..2d539aa 100644
--- a/src/server/stanza.h
+++ b/src/server/stanzas.h
@@ -1,5 +1,5 @@
 /*
- * stanza.h
+ * stanzas.h
  *
  * Copyright (C) 2015 James Booth <boothj5@gmail.com>
  *
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __H_STANZA
-#define __H_STANZA
+#ifndef __H_STANZAS
+#define __H_STANZAS
 
 #include <glib.h>
 
diff --git a/src/server/stream_parser.c b/src/server/stream_parser.c
index 2afa2dd..8392968 100644
--- a/src/server/stream_parser.c
+++ b/src/server/stream_parser.c
@@ -26,7 +26,7 @@
 #include <glib.h>
 
 #include "server/stream_parser.h"
-#include "server/stanza.h"
+#include "server/stanzas.h"
 #include "server/log.h"
 
 static int depth = 0;
diff --git a/src/server/stream_parser.h b/src/server/stream_parser.h
index caf8b1e..9a16513 100644
--- a/src/server/stream_parser.h
+++ b/src/server/stream_parser.h
@@ -23,7 +23,7 @@
 #ifndef __H_STREAM_PARSER
 #define __H_STREAM_PARSER
 
-#include "server/stanza.h"
+#include "server/stanzas.h"
 #include "server/xmppclient.h"
 
 typedef void (*stream_start_func)(void);
diff --git a/src/server/verify.c b/src/server/verify.c
index cdbfe14..a739ecb 100644
--- a/src/server/verify.c
+++ b/src/server/verify.c
@@ -25,7 +25,7 @@
 
 #include <expat.h>
 
-#include "server/stanza.h"
+#include "server/stanzas.h"
 #include "server/log.h"
 
 static int depth = 0;