diff --git a/d/include/psyc/Makefile b/d/include/psyc/Makefile
index d474c2f..3e8ad21 100644
--- a/d/include/psyc/Makefile
+++ b/d/include/psyc/Makefile
@@ -2,7 +2,7 @@ prefix = /usr
 includedir = ${prefix}/include/d
 
 INSTALL = install
-HEADERS = common.d parser.d
+HEADERS = common.d parse.d
 
 install: ${HEADERS}
 
diff --git a/d/include/psyc/parser.d b/d/include/psyc/parse.d
similarity index 99%
rename from d/include/psyc/parser.d
rename to d/include/psyc/parse.d
index e24bdf9..d655da2 100644
--- a/d/include/psyc/parser.d
+++ b/d/include/psyc/parse.d
@@ -1,4 +1,4 @@
-module psyc.parser;
+module psyc.parse;
 
 import psyc.common;
 
diff --git a/include/psyc/parse.h b/include/psyc/parse.h
index d5c3146..176779d 100644
--- a/include/psyc/parse.h
+++ b/include/psyc/parse.h
@@ -2,7 +2,7 @@
 
 /**
  * @file psyc/parse.h
- * @brief Interface for various PSYC parser functions.
+ * @brief Interface for various PSYC parsing functions.
  *
  * All parsing functions and the definitions they use are
  * defined in this file.
diff --git a/src/Makefile b/src/Makefile
index e0bb01b..f7dacad 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,8 +3,8 @@ DEBUG = 2
 CFLAGS = -I../include -Wall -std=c99 ${OPT}
 DIET = diet
 
-S = packet.c parser.c match.c render.c memmem.c itoa.c variable.c text.c
-O = packet.o parser.o match.o render.o memmem.o itoa.o variable.o text.o
+S = packet.c parse.c match.c render.c memmem.c itoa.c variable.c text.c
+O = packet.o parse.o match.o render.o memmem.o itoa.o variable.o text.o
 
 all: CC := ${WRAPPER} ${CC}
 all: lib
diff --git a/src/parser.c b/src/parse.c
similarity index 100%
rename from src/parser.c
rename to src/parse.c