diff --git a/libguac/src/protocol.c b/libguac/src/protocol.c
index 19bbaaa3..0846181e 100644
--- a/libguac/src/protocol.c
+++ b/libguac/src/protocol.c
@@ -405,7 +405,7 @@ int __guac_fill_instructionbuf(guac_socket* socket) {
 
 
 /* Returns new instruction if one exists, or NULL if no more instructions. */
-guac_instruction* guac_protocol_read_instruction(guac_socket* socket,
+guac_instruction* guac_instruction_read(guac_socket* socket,
         int usec_timeout) {
 
     int retval;
@@ -596,7 +596,7 @@ guac_instruction* guac_protocol_read_instruction(guac_socket* socket,
 }
 
 
-guac_instruction* guac_protocol_expect_instruction(guac_socket* socket, int usec_timeout,
+guac_instruction* guac_instruction_expect(guac_socket* socket, int usec_timeout,
         const char* opcode) {
 
     guac_instruction* instruction;
@@ -606,7 +606,7 @@ guac_instruction* guac_protocol_expect_instruction(guac_socket* socket, int usec
         return NULL;
 
     /* Read available instruction */
-    instruction = guac_protocol_read_instruction(socket, usec_timeout);
+    instruction = guac_instruction_read(socket, usec_timeout);
     if (instruction == NULL)
         return NULL;            
 
@@ -649,7 +649,7 @@ void guac_instruction_free(guac_instruction* instruction) {
 }
 
 
-int guac_protocol_instructions_waiting(guac_socket* socket, int usec_timeout) {
+int guac_instruction_waiting(guac_socket* socket, int usec_timeout) {
 
     if (socket->__instructionbuf_used_length > 0)
         return 1;
@@ -658,7 +658,7 @@ int guac_protocol_instructions_waiting(guac_socket* socket, int usec_timeout) {
 }
 
 
-guac_timestamp guac_protocol_get_timestamp() {
+guac_timestamp guac_timestamp_current() {
 
 #ifdef HAVE_CLOCK_GETTIME
 
diff --git a/libguac/tests/protocol/instruction_read.c b/libguac/tests/protocol/instruction_read.c
index 45e7083d..ef65a0be 100644
--- a/libguac/tests/protocol/instruction_read.c
+++ b/libguac/tests/protocol/instruction_read.c
@@ -40,9 +40,10 @@
 #include <stdlib.h>
 #include <CUnit/Basic.h>
 
-#include "socket.h"
-#include "protocol.h"
 #include "error.h"
+#include "instruction.h"
+#include "protocol.h"
+#include "socket.h"
 
 #include "suite.h"
 
@@ -92,7 +93,7 @@ void test_instruction_read() {
         CU_ASSERT_PTR_NOT_NULL_FATAL(socket);
 
         /* Read instruction */
-        instruction = guac_protocol_read_instruction(socket, 1000000);
+        instruction = guac_instruction_read(socket, 1000000);
         CU_ASSERT_PTR_NOT_NULL_FATAL(instruction);
         
         /* Validate contents */
@@ -104,7 +105,7 @@ void test_instruction_read() {
         
         /* Read another instruction */
         guac_instruction_free(instruction);
-        instruction = guac_protocol_read_instruction(socket, 1000000);
+        instruction = guac_instruction_read(socket, 1000000);
 
         /* Validate contents */
         CU_ASSERT_STRING_EQUAL(instruction->opcode, "test2");
diff --git a/libguac/tests/protocol/instruction_write.c b/libguac/tests/protocol/instruction_write.c
index 58b136a4..36a6838a 100644
--- a/libguac/tests/protocol/instruction_write.c
+++ b/libguac/tests/protocol/instruction_write.c
@@ -40,9 +40,10 @@
 #include <stdlib.h>
 #include <CUnit/Basic.h>
 
-#include "socket.h"
-#include "protocol.h"
 #include "error.h"
+#include "instruction.h"
+#include "protocol.h"
+#include "socket.h"
 
 #include "suite.h"