diff --git a/examples/client/client.c b/examples/client/client.c
index a2e094008..00f91a527 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -287,12 +287,12 @@ void client_test(void* args)
         args.argc = argc;
         args.argv = argv;
 
-        InitCyaSSL();
+        CyaSSL_Init();
 #ifdef DEBUG_CYASSL
         CyaSSL_Debugging_ON();
 #endif
         client_test(&args);
-        FreeCyaSSL();
+        CyaSSL_Cleanup();
 
         return args.return_code;
     }
diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c
index 426e4d8fe..00299ecf7 100644
--- a/examples/echoclient/echoclient.c
+++ b/examples/echoclient/echoclient.c
@@ -141,9 +141,9 @@ void echoclient_test(void* args)
         args.argc = argc;
         args.argv = argv;
 
-        InitCyaSSL();
+        CyaSSL_Init();
         echoclient_test(&args);
-        FreeCyaSSL();
+        CyaSSL_Cleanup();
 
         return args.return_code;
     }
diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c
index f7e753dad..57a8764cc 100644
--- a/examples/echoserver/echoserver.c
+++ b/examples/echoserver/echoserver.c
@@ -214,12 +214,12 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
         args.argc = argc;
         args.argv = argv;
 
-        InitCyaSSL();
+        CyaSSL_Init();
 #ifdef DEBUG_CYASSL
         CyaSSL_Debugging_ON();
 #endif
         echoserver_test(&args);
-        FreeCyaSSL();
+        CyaSSL_Cleanup();
 
         return args.return_code;
     }
diff --git a/examples/server/server.c b/examples/server/server.c
index 8eeac8055..48f07fbc2 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -171,12 +171,12 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
         args.argc = argc;
         args.argv = argv;
 
-        InitCyaSSL();
+        CyaSSL_Init();
 #ifdef DEBUG_CYASSL
         CyaSSL_Debugging_ON();
 #endif
         server_test(&args);
-        FreeCyaSSL();
+        CyaSSL_Cleanup();
 
         return args.return_code;
     }
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 472524121..e82a5d6bf 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -622,9 +622,9 @@ CYASSL_API int  SSL_CTX_get_ex_new_index(long, void*, void*, void*, void*);
 CYASSL_API int CyaSSL_check_domain_name(SSL* ssl, const char* dn);
 
 /* need to call once to load library (session cache) */
-CYASSL_API int InitCyaSSL(void);
-/* call when done to free session cache mutex        */
-CYASSL_API int FreeCyaSSL(void);
+CYASSL_API int CyaSSL_Init(void);
+/* call when done to cleanup/free session cache mutex / resources  */
+CYASSL_API int CyaSSL_Cleanup(void);
 
 /* turn logging on, only if compiled in */
 CYASSL_API int  CyaSSL_Debugging_ON(void);
diff --git a/src/ssl.c b/src/ssl.c
index e0e4faf62..8383cfe24 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -1194,7 +1194,7 @@ void SSL_load_error_strings(void)   /* compatibility only */
 int SSL_library_init(void)
 {
     CYASSL_ENTER("SSL_library_init");
-    if (InitCyaSSL() == 0)
+    if (CyaSSL_Init() == 0)
         return SSL_SUCCESS;
     else
         return SSL_FATAL_ERROR;
@@ -1677,10 +1677,10 @@ int SSL_CTX_set_cipher_list(SSL_CTX* ctx, const char* list)
 #endif /* NO_CYASSL_SERVER */
 
 
-int InitCyaSSL(void)
+int CyaSSL_Init(void)
 {
     int ret = 0;
-    CYASSL_ENTER("InitCyaSSL");
+    CYASSL_ENTER("CyaSSL_Init");
 #ifndef NO_SESSION_CACHE
     if (InitMutex(&session_mutex) != 0)
         ret = BAD_MUTEX_ERROR;
@@ -1692,10 +1692,10 @@ int InitCyaSSL(void)
 }
 
 
-int FreeCyaSSL(void)
+int CyaSSL_Cleanup(void)
 {
     int ret = 0;
-    CYASSL_ENTER("FreeCyaSSL");
+    CYASSL_ENTER("CyaSSL_Cleanup");
 #ifndef NO_SESSION_CACHE
     if (FreeMutex(&session_mutex) != 0)
         ret = BAD_MUTEX_ERROR;
@@ -2382,7 +2382,7 @@ int CyaSSL_set_compression(SSL* ssl)
     void OpenSSL_add_all_algorithms(void)
     {
         CYASSL_ENTER("OpenSSL_add_all_algorithms");
-        InitCyaSSL(); 
+        CyaSSL_Init(); 
     }
 
 
diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c
index 4c896303e..b3162d96e 100644
--- a/testsuite/testsuite.c
+++ b/testsuite/testsuite.c
@@ -43,7 +43,7 @@ int main(int argc, char** argv)
     if (args.return_code != 0) return args.return_code;
  
     /* Simple CyaSSL client server test */
-    InitCyaSSL();
+    CyaSSL_Init();
     InitTcpReady(&ready);
     server_args.signal = &ready;
     start_thread(server_test, &server_args, &serverThread);
@@ -105,7 +105,7 @@ int main(int argc, char** argv)
             return -1;
     }
 
-    FreeCyaSSL();
+    CyaSSL_Cleanup();
     FreeTcpReady(&ready);
 
     printf("\nAll tests passed!\n");