diff --git a/protocols/ssh/Makefile.am b/protocols/ssh/Makefile.am
index 4411fb4f..e73d711e 100644
--- a/protocols/ssh/Makefile.am
+++ b/protocols/ssh/Makefile.am
@@ -43,24 +43,24 @@ lib_LTLIBRARIES = libguac-client-ssh.la
 libguac_client_ssh_la_SOURCES = \
     src/blank.c                 \
     src/buffer.c                \
+    src/client.c                \
     src/common.c                \
     src/cursor.c                \
     src/display.c               \
+    src/guac_handlers.c         \
     src/ibar.c                  \
-    src/ssh_client.c            \
-    src/ssh_handlers.c          \
     src/terminal.c              \
     src/terminal_handlers.c
 
 noinst_HEADERS =                \
     include/blank.h             \
     include/buffer.h            \
+    include/client.h            \
     include/common.h            \
     include/cursor.h            \
     include/display.h           \
+    include/guac_handlers.h     \
     include/ibar.h              \
-    include/ssh_client.h        \
-    include/ssh_handlers.h      \
     include/terminal.h          \
     include/terminal_handlers.h \
     include/types.h
diff --git a/protocols/ssh/configure.in b/protocols/ssh/configure.in
index 89e055e0..c18eba87 100644
--- a/protocols/ssh/configure.in
+++ b/protocols/ssh/configure.in
@@ -34,8 +34,8 @@
 #
 # ***** END LICENSE BLOCK *****
 
-AC_INIT(src/ssh_client.c)
-AM_INIT_AUTOMAKE([libguac-client-ssh], 0.6.0)
+AC_INIT(src/client.c)
+AM_INIT_AUTOMAKE([libguac-client-ssh], 0.8.0)
 AC_CONFIG_MACRO_DIR([m4])
 
 # Checks for programs.
diff --git a/protocols/ssh/include/ssh_client.h b/protocols/ssh/include/client.h
similarity index 97%
rename from protocols/ssh/include/ssh_client.h
rename to protocols/ssh/include/client.h
index 03813836..b827f621 100644
--- a/protocols/ssh/include/ssh_client.h
+++ b/protocols/ssh/include/client.h
@@ -41,10 +41,6 @@
 
 #include <libssh/libssh.h>
 
-#include <guacamole/client.h>
-
-#include "ssh_client.h"
-#include "ssh_handlers.h"
 #include "terminal.h"
 #include "cursor.h"
 
diff --git a/protocols/ssh/include/ssh_handlers.h b/protocols/ssh/include/guac_handlers.h
similarity index 100%
rename from protocols/ssh/include/ssh_handlers.h
rename to protocols/ssh/include/guac_handlers.h
diff --git a/protocols/ssh/src/ssh_client.c b/protocols/ssh/src/client.c
similarity index 98%
rename from protocols/ssh/src/ssh_client.c
rename to protocols/ssh/src/client.c
index 9d10806e..e704ff75 100644
--- a/protocols/ssh/src/ssh_client.c
+++ b/protocols/ssh/src/client.c
@@ -45,8 +45,8 @@
 #include <guacamole/client.h>
 #include <guacamole/error.h>
 
-#include "ssh_client.h"
-#include "ssh_handlers.h"
+#include "client.h"
+#include "guac_handlers.h"
 #include "terminal.h"
 #include "blank.h"
 #include "ibar.h"
diff --git a/protocols/ssh/src/ssh_handlers.c b/protocols/ssh/src/guac_handlers.c
similarity index 99%
rename from protocols/ssh/src/ssh_handlers.c
rename to protocols/ssh/src/guac_handlers.c
index 023e66b4..294af139 100644
--- a/protocols/ssh/src/ssh_handlers.c
+++ b/protocols/ssh/src/guac_handlers.c
@@ -49,8 +49,8 @@
 #include <guacamole/client.h>
 #include <guacamole/error.h>
 
-#include "ssh_handlers.h"
-#include "ssh_client.h"
+#include "guac_handlers.h"
+#include "client.h"
 #include "common.h"
 #include "cursor.h"