diff --git a/LICENSE b/LICENSE
index 815fb76..ad1b19a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -111,7 +111,7 @@ Copyright © 1995 CERN. This product includes computer software created and made
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
+ * the following conditions are adhered to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
@@ -136,7 +136,7 @@ Copyright © 1995 CERN. This product includes computer software created and made
  *    must display the following acknowledgement:
  *    "This product includes cryptographic software written by
  *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
+ *    The word 'cryptographic' can be left out if the routines from the library
  *    being used are not cryptographic related :-).
  * 4. If you include any Windows specific code (or a derivative thereof) from 
  *    the apps directory (application code) you must include an acknowledgement:
diff --git a/config/ltmain.sh b/config/ltmain.sh
index 0f0a2da..5e204bd 100644
--- a/config/ltmain.sh
+++ b/config/ltmain.sh
@@ -1649,7 +1649,7 @@ func_options ()
 # All initialisations required before starting the option parse loop.
 # Note that when calling hook functions, we pass through the list of
 # positional parameters.  If a hook function modifies that list, and
-# needs to propogate that back to rest of this script, then the complete
+# needs to propagate that back to rest of this script, then the complete
 # modified list must be put in 'func_run_hooks_result' before
 # returning.
 func_hookable func_options_prep
diff --git a/example/android/ESTClient/src/com/cisco/estclient/ESTActivity.java b/example/android/ESTClient/src/com/cisco/estclient/ESTActivity.java
index a1576e9..c8b4b1a 100644
--- a/example/android/ESTClient/src/com/cisco/estclient/ESTActivity.java
+++ b/example/android/ESTClient/src/com/cisco/estclient/ESTActivity.java
@@ -236,19 +236,19 @@ private byte[] getTA() {
 			lCerts.append(0); 
 		} catch (NoSuchAlgorithmException e) {
 			// TODO Auto-generated catch block
-			logError("An error occured: " + e.getMessage());
+			logError("An error occurred: " + e.getMessage());
 			e.printStackTrace();
 		} catch (KeyStoreException e) {
 			// TODO Auto-generated catch block
-			logError("An error occured: " + e.getMessage());
+			logError("An error occurred: " + e.getMessage());
 			e.printStackTrace();
 		} catch (CertificateEncodingException e) {
 			// TODO Auto-generated catch block
-			logError("An error occured: " + e.getMessage());
+			logError("An error occurred: " + e.getMessage());
 			e.printStackTrace();
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
-			logError("An error occured: " + e.getMessage());
+			logError("An error occurred: " + e.getMessage());
 			e.printStackTrace();
 		}
 		
diff --git a/example/client/estclient.c b/example/client/estclient.c
index a8a2d6f..6b857dd 100644
--- a/example/client/estclient.c
+++ b/example/client/estclient.c
@@ -1309,7 +1309,7 @@ int main (int argc, char **argv)
             case 'i':
                 iterations = atoi(optarg);
                 if (iterations > MAX_ITERATIONS) {
-                    printf("\nMaxium number of iterations per thread is %d, ", MAX_ITERATIONS);
+                    printf("\nMaximum number of iterations per thread is %d, ", MAX_ITERATIONS);
                     printf("please use a lower value with the -i option\n");
                     exit(1);
                 }
diff --git a/example/proxy/estproxy.c b/example/proxy/estproxy.c
index 114bd65..1e50b82 100644
--- a/example/proxy/estproxy.c
+++ b/example/proxy/estproxy.c
@@ -164,7 +164,7 @@ static void show_usage_and_exit (void)
             "  --dtls-handshake-mtu Set the MTU used during DTLS handshake phase.\n"
             "  --dtls-session-max Set the maximum number of DTLS sessions.\n"
 #endif
-            "  --perf-timers-on  Enable the performace timers in proxy\n"
+            "  --perf-timers-on  Enable the performance timers in proxy\n"
             "\n");
     exit(255);
 }
diff --git a/example/server/estserver.c b/example/server/estserver.c
index 3539dc4..326a4a0 100644
--- a/example/server/estserver.c
+++ b/example/server/estserver.c
@@ -274,7 +274,7 @@ static void show_usage_and_exit (void)
             "  --dtls-handshake-mtu Set the MTU used during DTLS handshake phase.\n"
             "  --dtls-session-max Set the maximum number of DTLS sessions.\n"
 #endif
-            "  --perf-timers-on  Enable the performace timers in server\n"
+            "  --perf-timers-on  Enable the performance timers in server\n"
             "\n");
     exit(255);
 }
diff --git a/src/est/est_locl.h b/src/est/est_locl.h
index b16f62d..d4c69ea 100644
--- a/src/est/est_locl.h
+++ b/src/est/est_locl.h
@@ -211,10 +211,10 @@ DHE-DSS-AES256-SHA256"
 #define EST_BODY_UNAUTHORIZED   "The server was unable to authorize the request.\n"
 #define EST_BODY_POP_MISMATCH   "Proof of Possession Mismatch.\n"
 #define EST_BODY_BAD_METH       "Invalid HTTP method used.  Either GET or POST required depending on the request type.\n"
-#define EST_BODY_BAD_SSL        "An unknown TLS error has occured.\n"
+#define EST_BODY_BAD_SSL        "An unknown TLS error has occurred.\n"
 #define EST_BODY_LOCKED    "The content attempted to be accessed is locked.\n"
-#define EST_BODY_ENROLL_FAIL    "An error has occured during enrollment.\n"
-#define EST_BODY_UNKNOWN_ERR    "An unknown error has occured.\n"
+#define EST_BODY_ENROLL_FAIL    "An error has occurred during enrollment.\n"
+#define EST_BODY_UNKNOWN_ERR    "An unknown error has occurred.\n"
 #define EST_BODY_INVALID_PATH_SEGMENT "The path specified is not recognized.\n"
 #define EST_BODY_NOT_FOUND      "Requested content is currently not available on the server.\n"
 #define EST_BODY_BAD_GATEWAY "An error occurred while communicating to the upstream server.\n"
diff --git a/src/est/est_ossl_util.c b/src/est/est_ossl_util.c
index daa54f2..db1e233 100644
--- a/src/est/est_ossl_util.c
+++ b/src/est/est_ossl_util.c
@@ -20,7 +20,7 @@
  * The implementation was written so as to conform with Netscapes SSL.
  *
  * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
+ * the following conditions are adhered to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
diff --git a/src/est/est_proxy.c b/src/est/est_proxy.c
index 3cc7bad..0552c14 100644
--- a/src/est/est_proxy.c
+++ b/src/est/est_proxy.c
@@ -322,7 +322,7 @@ static EST_ERROR est_proxy_propagate_keygen_rsp (void *http_ctx,
      * Send the PKCS8 private key in the body
      */
     if (!mg_write(http_ctx, key, key_len)) {
-        EST_LOG_ERR("HTTP write error while propogating server generated key");
+        EST_LOG_ERR("HTTP write error while propagating server generated key");
         return (EST_ERR_HTTP_WRITE);
     }
 
@@ -826,7 +826,7 @@ EST_ERROR est_proxy_handle_simple_enroll (EST_CTX *ctx, void *http_ctx,
         break;
     default:
         /* This section will map to a 500 repsonse */
-        EST_LOG_ERR("Proxy: Unhandled error occured while communicating with "
+        EST_LOG_ERR("Proxy: Unhandled error occurred while communicating with "
                     "the upstream server %s (%d)",
                     EST_ERR_NUM_TO_STR(rv), rv);
         rv = EST_ERR_UNKNOWN;
@@ -842,7 +842,7 @@ EST_ERROR est_proxy_handle_simple_enroll (EST_CTX *ctx, void *http_ctx,
 
     /*
      * If we have a cert response from the EST server, we pass it
-     * back to the caller.  In HTTP mode we propogate it back right
+     * back to the caller.  In HTTP mode we propagate it back right
      * here and pass it back so it can be passed in the event notification
      * handler, if needed.  In CoAP mode, we just pass it back to the
      * caller (the CoAP handler) and have the caller send it back and
@@ -1097,7 +1097,7 @@ EST_ERROR est_proxy_handle_server_keygen (EST_CTX *ctx, void *http_ctx,
         break;
     default:
         /* This section will map to a 500 repsonse */
-        EST_LOG_ERR("Proxy: Unhandled error occured while communicating with "
+        EST_LOG_ERR("Proxy: Unhandled error occurred while communicating with "
                     "the upstream server %s (%d)",
                     EST_ERR_NUM_TO_STR(rv), rv);
         rv = EST_ERR_UNKNOWN;
@@ -1113,7 +1113,7 @@ EST_ERROR est_proxy_handle_server_keygen (EST_CTX *ctx, void *http_ctx,
 
     /*
      * If we have a response from the EST server, we pass it
-     * back to the caller.  In HTTP mode we propogate it back right
+     * back to the caller.  In HTTP mode we propagate it back right
      * here and pass it back so it can be passed in the event notification
      * handler, if needed.  In CoAP mode, we just pass it back to the
      * caller (the CoAP handler) and have the caller send it back and
@@ -1293,7 +1293,7 @@ EST_ERROR est_proxy_handle_cacerts (EST_CTX *ctx, void *http_ctx, char *path_seg
             return rv;
         default:
             /* This section will map to a 500 repsonse */
-            EST_LOG_ERR("Proxy: Unhandled error occured while communicating "
+            EST_LOG_ERR("Proxy: Unhandled error occurred while communicating "
                         "with the upstream server %s (%d)",
                         EST_ERR_NUM_TO_STR(rv), rv);
             return (EST_ERR_UNKNOWN);
@@ -1440,7 +1440,7 @@ EST_ERROR est_proxy_handle_csr_attrs (EST_CTX *ctx, void *http_ctx,
         return rv;
     default:
         /* This section will map to a 500 repsonse */
-        EST_LOG_ERR("Proxy: Unhandled error occured while communicating with "
+        EST_LOG_ERR("Proxy: Unhandled error occurred while communicating with "
                     "the upstream server %s (%d)",
                     EST_ERR_NUM_TO_STR(rv), rv);
         return (EST_ERR_UNKNOWN);
diff --git a/src/est/est_server.c b/src/est/est_server.c
index d047b48..a61edcf 100644
--- a/src/est/est_server.c
+++ b/src/est/est_server.c
@@ -2189,7 +2189,7 @@ EST_ERROR est_handle_server_keygen (EST_CTX *ctx, void *http_ctx,
             }
 
         } else if (ctx->transport_mode != EST_COAP) {
-            EST_LOG_ERR("EST in improper transport mode. Cannot propogate server retry to client.");
+            EST_LOG_ERR("EST in improper transport mode. Cannot propagate server retry to client.");
             return_code = EST_ERR_BAD_MODE;
             goto free_buffers;
         }
diff --git a/test/UT/US5418/us5418h.c b/test/UT/US5418/us5418h.c
index e5d289a..189e3e3 100644
--- a/test/UT/US5418/us5418h.c
+++ b/test/UT/US5418/us5418h.c
@@ -193,16 +193,16 @@ EST_ERROR setup_client_ctx(EST_CTX **cctx) {
     }
     est_err = est_client_set_server(*cctx, US5418_SERVER_IP, US5418_SERVER_PORT, NULL);
     if (est_err != EST_ERR_NONE) {
-        printf("EST_ERROR %s occured while setting the server in the est client context\n",
+        printf("EST_ERROR %s occurred while setting the server in the est client context\n",
                EST_ERR_NUM_TO_STR(est_err));
-        CU_FAIL("EST error occured while setting the server in the est client context");
+        CU_FAIL("EST error occurred while setting the server in the est client context");
         return est_err;
     }
     est_err = est_client_set_auth(*cctx, "estuser", "estpwd", client_cert, client_pkey);
     if (est_err != EST_ERR_NONE) {
-        printf("EST_ERROR %s occured while setting the auth in the est client context\n",
+        printf("EST_ERROR %s occurred while setting the auth in the est client context\n",
                EST_ERR_NUM_TO_STR(est_err));
-        CU_FAIL("EST error occured while setting the auth in the est client context");
+        CU_FAIL("EST error occurred while setting the auth in the est client context");
         return est_err;
     }
     return EST_ERR_NONE;
@@ -240,9 +240,9 @@ static EST_ERROR perform_est_request (REQUESTS request_type, EVP_PKEY *pkey,
     est_err = setup_cb(&cctx);
     if (est_err != EST_ERR_NONE) {
         /* No success variable in here so can't use CU_FAIL_5418 */
-        printf("EST_ERROR %s occured during setup of client context\n",
+        printf("EST_ERROR %s occurred during setup of client context\n",
                EST_ERR_NUM_TO_STR(est_err));
-        CU_FAIL("EST error occured during setup of client context");
+        CU_FAIL("EST error occurred during setup of client context");
         if (cctx) {
             est_destroy(cctx);
         }
@@ -252,48 +252,48 @@ static EST_ERROR perform_est_request (REQUESTS request_type, EVP_PKEY *pkey,
     case SIMPLE_ENROLL:
         est_err = est_client_enroll(cctx, "testcert", &pkcs7_len, pkey);
         if (est_err != EST_ERR_NONE) {
-            printf("EST_ERROR %s occured during enrollment request\n",
+            printf("EST_ERROR %s occurred during enrollment request\n",
                    EST_ERR_NUM_TO_STR(est_err));
-            CU_FAIL("EST error occured during enrollment request");
+            CU_FAIL("EST error occurred during enrollment request");
         }
         break;
     case GET_CACERTS:
         est_err = est_client_get_cacerts(cctx, &cacerts_len);
         if (est_err != EST_ERR_NONE) {
-            printf("EST_ERROR %s occured during get cacerts request\n",
+            printf("EST_ERROR %s occurred during get cacerts request\n",
                    EST_ERR_NUM_TO_STR(est_err));
-            CU_FAIL("EST error occured during get cacerts request");
+            CU_FAIL("EST error occurred during get cacerts request");
         }
         break;
     case CSR_ATTRS:
         est_err = est_client_get_csrattrs(cctx, &csr_attrs_buf, &csr_attrs_len);
         if (est_err != EST_ERR_NONE) {
-            printf("EST_ERROR %s occured during get csr attrs request\n",
+            printf("EST_ERROR %s occurred during get csr attrs request\n",
                    EST_ERR_NUM_TO_STR(est_err));
-            CU_FAIL("EST error occured during get csr attrs request");
+            CU_FAIL("EST error occurred during get csr attrs request");
         }
         break;
     case SERVER_KEYGEN:
         est_err = est_client_server_keygen_enroll(cctx, "testcert", &pkcs7_len,
                                                   &newkey_len, pkey);
         if (est_err != EST_ERR_NONE) {
-            printf("EST_ERROR %s occured during get server keygen request\n",
+            printf("EST_ERROR %s occurred during get server keygen request\n",
                    EST_ERR_NUM_TO_STR(est_err));
-            CU_FAIL("EST error occured during get server keygen request");
+            CU_FAIL("EST error occurred during get server keygen request");
         }
         break;
     case SIMPLE_REENROLL:
         est_err = est_client_reenroll(cctx, reenroll_cert, &pkcs7_len, pkey);
         if (est_err != EST_ERR_NONE) {
-            printf("EST_ERROR %s occured during reenroll request\n",
+            printf("EST_ERROR %s occurred during reenroll request\n",
                    EST_ERR_NUM_TO_STR(est_err));
-            CU_FAIL("EST error occured during reenroll request");
+            CU_FAIL("EST error occurred during reenroll request");
         }
         break;
     default:
-        printf("EST_ERROR %s occured during get csr attrs request\n",
+        printf("EST_ERROR %s occurred during get csr attrs request\n",
                EST_ERR_NUM_TO_STR(est_err));
-        CU_FAIL("EST error occured during get csr attrs request");
+        CU_FAIL("EST error occurred during get csr attrs request");
         est_err = EST_ERR_INVALID_PARAMETERS;
     }
     if (cctx) {
diff --git a/test/util/apps.h b/test/util/apps.h
index 523da6e..d826c73 100644
--- a/test/util/apps.h
+++ b/test/util/apps.h
@@ -7,7 +7,7 @@
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
+ * the following conditions are adhered to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
@@ -32,7 +32,7 @@
  *    must display the following acknowledgement:
  *    "This product includes cryptographic software written by
  *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
+ *    The word 'cryptographic' can be left out if the routines from the library
  *    being used are not cryptographic related :-).
  * 4. If you include any Windows specific code (or a derivative thereof) from 
  *    the apps directory (application code) you must include an acknowledgement:
diff --git a/test/util/ossl_srv.c b/test/util/ossl_srv.c
index 3efefa4..2c48c3b 100644
--- a/test/util/ossl_srv.c
+++ b/test/util/ossl_srv.c
@@ -20,7 +20,7 @@
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
+ * the following conditions are adhered to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
@@ -45,7 +45,7 @@
  *    must display the following acknowledgement:
  *    "This product includes cryptographic software written by
  *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
+ *    The word 'cryptographic' can be left out if the routines from the library
  *    being used are not cryptographic related :-).
  * 4. If you include any Windows specific code (or a derivative thereof) from 
  *    the apps directory (application code) you must include an acknowledgement: