diff --git a/.gitignore b/.gitignore
index eff650f..5117ae4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,6 @@ m4/
 runstabber
 src/.deps/
 src/.dirstamp
-src/server/parser.lo
 src/server/server.lo
 src/server/xmppclient.lo
 src/client/.dirstamp
@@ -44,5 +43,6 @@ src/server/verify.lo
 src/server/httpapi.lo
 src/server/stream_parser.lo
 src/server/stanzas.lo
+src/server/stanza.lo
 
 stabbertest
diff --git a/Makefile.am b/Makefile.am
index 4a3707a..16856b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ sources = \
 	src/server/httpapi.c src/server/httpapi.h \
 	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 \
diff --git a/src/server/prime.c b/src/server/prime.c
index 8a641d6..f91966e 100644
--- a/src/server/prime.c
+++ b/src/server/prime.c
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include "server/stanzas.h"
-#include "server/parser.h"
+#include "server/stanza.h"
 
 static char *required_passwd = NULL;
 static GHashTable *idstubs = NULL;
diff --git a/src/server/parser.c b/src/server/stanza.c
similarity index 99%
rename from src/server/parser.c
rename to src/server/stanza.c
index f6dd37d..8063c2b 100644
--- a/src/server/parser.c
+++ b/src/server/stanza.c
@@ -1,5 +1,5 @@
 /*
- * parser.c
+ * stanza.c
  *
  * Copyright (C) 2015 James Booth <boothj5@gmail.com>
  *
diff --git a/src/server/parser.h b/src/server/stanza.h
similarity index 94%
rename from src/server/parser.h
rename to src/server/stanza.h
index b1bd2de..e473b82 100644
--- a/src/server/parser.h
+++ b/src/server/stanza.h
@@ -1,5 +1,5 @@
 /*
- * parser.h
+ * stanza.h
  *
  * Copyright (C) 2015 James Booth <boothj5@gmail.com>
  *
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __H_PARSER
-#define __H_PARSER
+#ifndef __H_STANZA
+#define __H_STANZA
 
 #include "server/stanzas.h"