diff --git a/Jupiter/Base64.cpp b/Jupiter/Base64.cpp
index 05f037c..b78c4c4 100644
--- a/Jupiter/Base64.cpp
+++ b/Jupiter/Base64.cpp
@@ -27,7 +27,7 @@ char *Jupiter::base64encode(const char *str)
 
 unsigned int Jupiter::base64decode(const char *data, size_t dataLength, unsigned char *result)
 {
-	return Jupiter_base64decode2(data, dataLength, result);
+	return Jupiter_base64decode_s(data, dataLength, result);
 }
 
 unsigned int Jupiter::base64decode(const char *data, size_t dataLength, unsigned char *result, size_t resultSize)
diff --git a/Jupiter/Base64.h b/Jupiter/Base64.h
index 0b7792b..fb76824 100644
--- a/Jupiter/Base64.h
+++ b/Jupiter/Base64.h
@@ -147,7 +147,7 @@ JUPITER_API bool Jupiter_isBase64(const char *str);
 * @param dataLength Length of the data to check.
 * @return True if the input buffer is a valid base64 string, false otherwise.
 */
-JUPITER_API bool Jupiter_isBase642(const char *data, size_t dataLength);
+JUPITER_API bool Jupiter_isBase64_s(const char *data, size_t dataLength);
 
 /**
 * @brief Decodes an input base64 C-String into a data buffer.
@@ -166,7 +166,7 @@ JUPITER_API unsigned int Jupiter_base64decode(const char *str, unsigned char *re
 * @param result Data buffer for output.
 * @return Number of bytes written to the output buffer.
 */
-JUPITER_API unsigned int Jupiter_base64decode2(const char *data, size_t dataLength, unsigned char *result);
+JUPITER_API unsigned int Jupiter_base64decode_s(const char *data, size_t dataLength, unsigned char *result);
 
 #if defined __cplusplus
 }
diff --git a/Jupiter/Base64C.c b/Jupiter/Base64C.c
index 7c23ab2..f809e7a 100644
--- a/Jupiter/Base64C.c
+++ b/Jupiter/Base64C.c
@@ -121,7 +121,7 @@ bool Jupiter_isBase64(const char *in)
 	return true;
 }
 
-bool Jupiter_isBase642(const char *in, size_t inLen)
+bool Jupiter_isBase64_s(const char *in, size_t inLen)
 {
 	if (inLen % 4 != 0)
 	{
@@ -192,7 +192,7 @@ endLoop:
 	return out - outOrig;
 }
 
-unsigned int Jupiter_base64decode2(const char *in, size_t inLen, unsigned char *out)
+unsigned int Jupiter_base64decode_s(const char *in, size_t inLen, unsigned char *out)
 {
 	unsigned char *outOrig = out;
 	const char *end = in + inLen;