diff --git a/base64.cc b/base64.cc
index 4787275be..8db148e56 100644
--- a/base64.cc
+++ b/base64.cc
@@ -22,17 +22,17 @@
 
 #include "base64.h"
 
-const char Base64::b64_values[] = 
+const char base64::b64_values[] = 
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-void Base64::decodeblock(unsigned char *in, unsigned char *out) {
+void base64::decodeblock(unsigned char *in, unsigned char *out) {
     out[0] = in[0] << 2 | in[1] >> 4;
     out[1] = in[1] << 4 | in[2] >> 2;
     out[2] = in[2] << 6 | in[3] >> 0;
     out[3] = 0;
 }
 
-std::string Base64::decode(std::string in_str) {
+std::string base64::decode(std::string in_str) {
     std::string out;
     unsigned char obuf[4], ibuf[4];
     int phase, c;
diff --git a/base64.h b/base64.h
index daf14c6c2..a1591d75e 100644
--- a/base64.h
+++ b/base64.h
@@ -28,7 +28,7 @@
  * Needed to handle b64 encoded post data for the webserver
  */
 
-class Base64 {
+class base64 {
 public:
     /* Decode a string; return raw data if it was valid */
     static std::string decode(std::string in_str);
diff --git a/gpsweb.cc b/gpsweb.cc
index 8ea58c21d..631e345e8 100644
--- a/gpsweb.cc
+++ b/gpsweb.cc
@@ -117,7 +117,7 @@ int GPSWeb::Httpd_PostIterator(void *coninfo_cls, enum MHD_ValueKind kind,
     if (concls->url == "/gps/web/update.cmd") {
 #if 0
         if (strcmp(key, "msgpack") == 0 && size > 0) {
-            std::string decode = Base64::decode(std::string(data));
+            std::string decode = base64::decode(std::string(data));
 
             // Get the dictionary
             MsgpackAdapter::MsgpackStrMap params;