diff --git a/Makefile b/Makefile
index 6a10604..06be840 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@
 DEVICE     = atmega328p
 CLOCK      = 16000000
 PROGRAMMER = -c avrisp2 -P usb
-OBJECTS    = main.o motion_control.o gcode.o spindle_control.o wiring_serial.o serial_protocol.o stepper.o \
+OBJECTS    = main.o motion_control.o gcode.o spindle_control.o wiring_serial.o protocol.o stepper.o \
              eeprom.o settings.o planner.o
 # FUSES      = -U hfuse:w:0xd9:m -U lfuse:w:0x24:m
 FUSES      = -U hfuse:w:0xd2:m -U lfuse:w:0xff:m
diff --git a/gcode.c b/gcode.c
index ccb5d48..320ac0b 100644
--- a/gcode.c
+++ b/gcode.c
@@ -30,7 +30,7 @@
 #include "motion_control.h"
 #include "spindle_control.h"
 #include "errno.h"
-#include "serial_protocol.h"
+#include "protocol.h"
 
 #define MM_PER_INCH (25.4)
 
diff --git a/main.c b/main.c
index 0b9a354..ac9c54d 100644
--- a/main.c
+++ b/main.c
@@ -26,7 +26,7 @@
 #include "spindle_control.h"
 #include "motion_control.h"
 #include "gcode.h"
-#include "serial_protocol.h"
+#include "protocol.h"
 
 #include "settings.h"
 #include "wiring_serial.h"
diff --git a/serial_protocol.c b/protocol.c
similarity index 96%
rename from serial_protocol.c
rename to protocol.c
index f2dcd47..488836b 100644
--- a/serial_protocol.c
+++ b/protocol.c
@@ -1,5 +1,5 @@
 /*
-  serial_protocol.c - the serial protocol master control unit
+  protocol.c - the serial protocol master control unit
   Part of Grbl
 
   Copyright (c) 2009-2011 Simen Svale Skogsrud
@@ -19,7 +19,7 @@
 */
 
 #include <avr/io.h>
-#include "serial_protocol.h"
+#include "protocol.h"
 #include "gcode.h"
 #include "wiring_serial.h"
 #include "settings.h"
diff --git a/serial_protocol.h b/protocol.h
similarity index 93%
rename from serial_protocol.h
rename to protocol.h
index ee9ecf4..597205e 100644
--- a/serial_protocol.h
+++ b/protocol.h
@@ -1,5 +1,5 @@
 /*
-  serial_protocol.h - the serial protocol master control unit
+  protocol.h - the serial protocol master control unit
   Part of Grbl
 
   Copyright (c) 2009-2011 Simen Svale Skogsrud