diff --git a/tirtos/README b/tirtos/README
index 6581a9dd6..c933e662c 100644
--- a/tirtos/README
+++ b/tirtos/README
@@ -1,33 +1,33 @@
-CyaSSL library for TI-RTOS
+wolfSSL library for TI-RTOS
 
-This directory contains the files that build CyaSSL library for TI-RTOS. 
+This directory contains the files that build wolfSSL library for TI-RTOS. 
 Please follow the instructions in TI-RTOS user guide (www.ti.com/tool/ti-rtos) 
-to build the CyaSSL library and the example applications.
+to build the wolfSSL library and the example applications.
 
 Included Files
 ---------------
 
-1. CyaSSL library build files (packages/ti/net/cyassl)
+1. wolfSSL library build files (packages/ti/net/wolfssl)
 
     Build instructions provided in TI-RTOS user guide (www.ti.com/tool/ti-rtos)
 
-2. CTaoCrypt test application (packages/ti/net/cyassl/tests/ctaocrypt/test)
+2. wc_ test application (packages/ti/net/wolfssl/tests/wolfcrypt/test)
 
-    This application is the standard CTaoCrypt test application provided with
-    CyaSSL.
+    This application is the standard wc_ test application provided with
+    wolfSSL.
    
-    It will be built along with the CyaSSL library. Load the built executable
-    on the target and make sure the CyaSSL library works as expected.
+    It will be built along with the wolfSSL library. Load the built executable
+    on the target and make sure the wolfSSL library works as expected.
 
-3. CTaoCrypt benchmark application 
-   (packages/ti/net/cyassl/tests/ctaocrypt/benchmark)
+3. wc_ benchmark application 
+   (packages/ti/net/wolfssl/tests/wolfcrypt/benchmark)
 
-    This application is the standard CTaoCrypt benchmark application provided
-    with CyaSSL.
+    This application is the standard wc_ benchmark application provided
+    with wolfSSL.
 
-    It will be built along with the CyaSSL library. Load the built executable
+    It will be built along with the wolfSSL library. Load the built executable
     on the target and run to get the benchmark results for the configured 
-    CyaSSL library.
+    wolfSSL library.
 
 Examples Application
 --------------------
diff --git a/tirtos/include.am b/tirtos/include.am
index 3650e6164..46bdd4323 100644
--- a/tirtos/include.am
+++ b/tirtos/include.am
@@ -4,19 +4,19 @@
 
 EXTRA_DIST += \
          tirtos/README \
-         tirtos/cyassl.bld \
-         tirtos/cyassl.mak \
-         tirtos/packages/ti/net/cyassl/package.bld \
-         tirtos/packages/ti/net/cyassl/package.xdc \
-         tirtos/packages/ti/net/cyassl/package.xs \
-         tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/package.bld \
-         tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/package.xdc \
-         tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/test.cfg \
-         tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/TM4C1294NC.icf \
-         tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/main.c \
-         tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/package.bld \
-         tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/package.xdc \
-         tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/benchmark.cfg \
-        tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/TM4C1294NC.icf \
-         tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/main.c
+         tirtos/wolfssl.bld \
+         tirtos/wolfssl.mak \
+         tirtos/packages/ti/net/wolfssl/package.bld \
+         tirtos/packages/ti/net/wolfssl/package.xdc \
+         tirtos/packages/ti/net/wolfssl/package.xs \
+         tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/package.bld \
+         tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/package.xdc \
+         tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/test.cfg \
+         tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/TM4C1294NC.icf \
+         tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/main.c \
+         tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/package.bld \
+         tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/package.xdc \
+         tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/benchmark.cfg \
+        tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/TM4C1294NC.icf \
+         tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/main.c
 
diff --git a/tirtos/packages/ti/net/cyassl/package.bld b/tirtos/packages/ti/net/cyassl/package.bld
deleted file mode 100644
index d28f06e66..000000000
--- a/tirtos/packages/ti/net/cyassl/package.bld
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  ======== package.bld ========
- *  Build script for CyaSSL library
- */
-var Build = xdc.useModule('xdc.bld.BuildEnvironment');
-var Pkg = xdc.useModule('xdc.bld.PackageContents');
-
-/* make command to search for the srcs */ 
-Pkg.makePrologue = "vpath %.c $(subst ;,  ,$(XPKGPATH))";
-
-/* CYASSL sources */
-var cyaSSLObjList = [
-    "ctaocrypt/src/aes.c",
-    "ctaocrypt/src/arc4.c",
-    "ctaocrypt/src/asm.c",
-    "ctaocrypt/src/asn.c",
-    "ctaocrypt/src/blake2b.c",
-    "ctaocrypt/src/camellia.c",
-    "ctaocrypt/src/chacha.c",
-    "ctaocrypt/src/coding.c", 
-    "ctaocrypt/src/des3.c",
-    "ctaocrypt/src/dh.c",
-    "ctaocrypt/src/dsa.c",
-    "ctaocrypt/src/ecc.c",
-    "ctaocrypt/src/error.c",
-    "ctaocrypt/src/hc128.c",
-    "ctaocrypt/src/hmac.c",
-    "ctaocrypt/src/integer.c",
-    "ctaocrypt/src/logging.c",
-    "ctaocrypt/src/md4.c",
-    "ctaocrypt/src/md5.c",
-    "ctaocrypt/src/memory.c",
-    "ctaocrypt/src/poly1305.c",
-    "ctaocrypt/src/pwdbased.c",
-    "ctaocrypt/src/rabbit.c",
-    "ctaocrypt/src/random.c",
-    "ctaocrypt/src/rsa.c",
-    "ctaocrypt/src/sha.c",
-    "ctaocrypt/src/sha256.c",
-    "ctaocrypt/src/sha512.c",
-    "ctaocrypt/src/tfm.c",
-    "ctaocrypt/src/wc_port.c",
-
-    "src/internal.c",
-    "src/io.c",
-    "src/keys.c",
-    "src/ssl.c",
-    "src/tls.c",
-    ];
-
-for each (var targ in Build.targets) {
-    var libOptions = {incs: cyasslPathInclude};
-    var lib = Pkg.addLibrary("lib/" + Pkg.name, targ, libOptions);
-    lib.addObjects(cyaSSLObjList);
-}
-
diff --git a/tirtos/packages/ti/net/cyassl/package.xdc b/tirtos/packages/ti/net/cyassl/package.xdc
deleted file mode 100644
index d5c949ce3..000000000
--- a/tirtos/packages/ti/net/cyassl/package.xdc
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- *  ======== ti.net.cyassl ========
- *  CyaSSL library for TI-RTOS
- *
- */
-package ti.net.cyassl {
-}
diff --git a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/package.xdc b/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/package.xdc
deleted file mode 100644
index e3913bf65..000000000
--- a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/package.xdc
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  ======== ti.net.cyassl.tests.ctaocrypt.benchmark ========
- *  CTaoCrypt Benchmark Application
- */
-package ti.net.cyassl.tests.ctaocrypt.benchmark {
-}
diff --git a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/package.xdc b/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/package.xdc
deleted file mode 100644
index 72188a231..000000000
--- a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/package.xdc
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  ======== ti.net.cyassl.tests.ctaocrypt.test ========
- *  Ctaocrypt Test Application
- */
-package ti.net.cyassl.tests.ctaocrypt.test {
-}
diff --git a/tirtos/packages/ti/net/wolfssl/package.bld b/tirtos/packages/ti/net/wolfssl/package.bld
new file mode 100644
index 000000000..95d0811ac
--- /dev/null
+++ b/tirtos/packages/ti/net/wolfssl/package.bld
@@ -0,0 +1,56 @@
+/*
+ *  ======== package.bld ========
+ *  Build script for wolfSSL library
+ */
+var Build = xdc.useModule('xdc.bld.BuildEnvironment');
+var Pkg = xdc.useModule('xdc.bld.PackageContents');
+
+/* make command to search for the srcs */ 
+Pkg.makePrologue = "vpath %.c $(subst ;,  ,$(XPKGPATH))";
+
+/* WOLFSSL sources */
+var wolfSSLObjList = [
+    "wolfcrypt/src/aes.c",
+    "wolfcrypt/src/arc4.c",
+    "wolfcrypt/src/asm.c",
+    "wolfcrypt/src/asn.c",
+    "wolfcrypt/src/blake2b.c",
+    "wolfcrypt/src/camellia.c",
+    "wolfcrypt/src/chacha.c",
+    "wolfcrypt/src/coding.c", 
+    "wolfcrypt/src/des3.c",
+    "wolfcrypt/src/dh.c",
+    "wolfcrypt/src/dsa.c",
+    "wolfcrypt/src/ecc.c",
+    "wolfcrypt/src/error.c",
+    "wolfcrypt/src/hc128.c",
+    "wolfcrypt/src/hmac.c",
+    "wolfcrypt/src/integer.c",
+    "wolfcrypt/src/logging.c",
+    "wolfcrypt/src/md4.c",
+    "wolfcrypt/src/md5.c",
+    "wolfcrypt/src/memory.c",
+    "wolfcrypt/src/poly1305.c",
+    "wolfcrypt/src/pwdbased.c",
+    "wolfcrypt/src/rabbit.c",
+    "wolfcrypt/src/random.c",
+    "wolfcrypt/src/rsa.c",
+    "wolfcrypt/src/sha.c",
+    "wolfcrypt/src/sha256.c",
+    "wolfcrypt/src/sha512.c",
+    "wolfcrypt/src/tfm.c",
+    "wolfcrypt/src/wc_port.c",
+
+    "src/internal.c",
+    "src/io.c",
+    "src/keys.c",
+    "src/ssl.c",
+    "src/tls.c",
+    ];
+
+for each (var targ in Build.targets) {
+    var libOptions = {incs: wolfsslPathInclude};
+    var lib = Pkg.addLibrary("lib/" + Pkg.name, targ, libOptions);
+    lib.addObjects(wolfSSLObjList);
+}
+
diff --git a/tirtos/packages/ti/net/wolfssl/package.xdc b/tirtos/packages/ti/net/wolfssl/package.xdc
new file mode 100644
index 000000000..f0c4b9f83
--- /dev/null
+++ b/tirtos/packages/ti/net/wolfssl/package.xdc
@@ -0,0 +1,7 @@
+/*!
+ *  ======== ti.net.wolfssl ========
+ *  wolfSSL library for TI-RTOS
+ *
+ */
+package ti.net.wolfssl {
+}
diff --git a/tirtos/packages/ti/net/cyassl/package.xs b/tirtos/packages/ti/net/wolfssl/package.xs
similarity index 84%
rename from tirtos/packages/ti/net/cyassl/package.xs
rename to tirtos/packages/ti/net/wolfssl/package.xs
index df428bbd8..9ecf38e5b 100644
--- a/tirtos/packages/ti/net/cyassl/package.xs
+++ b/tirtos/packages/ti/net/wolfssl/package.xs
@@ -4,7 +4,7 @@
 
 /*
  *  ======== getLibs ========
- *  Contribute CyaSSL library.
+ *  Contribute wolfSSL library.
  */
 function getLibs(prog) 
 {
diff --git a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/TM4C1294NC.icf b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/TM4C1294NC.icf
similarity index 100%
rename from tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/TM4C1294NC.icf
rename to tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/TM4C1294NC.icf
diff --git a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/benchmark.cfg b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/benchmark.cfg
similarity index 89%
rename from tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/benchmark.cfg
rename to tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/benchmark.cfg
index dd98b6264..e259718d6 100644
--- a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/benchmark.cfg
+++ b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/benchmark.cfg
@@ -69,13 +69,13 @@ var TIRTOS = xdc.useModule('ti.tirtos.TIRTOS');
 TIRTOS.useEMAC = true;
 TIRTOS.useGPIO = true;
 
-/* ================ CyaSSL configuration ================ */
+/* ================ wolfSSL configuration ================ */
 try {
-    var CyaSSL = xdc.loadPackage('ti.net.cyassl');
+    var wolfSSL = xdc.loadPackage('ti.net.wolfssl');
 }
 catch (e) {
-    print("Error: Could not find CyaSSL library! Make sure the CyaSSL library"
+    print("Error: Could not find wolfSSL library! Make sure the wolfSSL library"
           + " is built and package path is updated for the build tool"
-          + " to find the library. More detailed CyaSSL build instructions"
+          + " to find the library. More detailed wolfSSL build instructions"
           + " can be found in the TI-RTOS user guide.");
 }
diff --git a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/main.c b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/main.c
similarity index 98%
rename from tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/main.c
rename to tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/main.c
index 82f00d5f4..15ee1fb98 100644
--- a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/main.c
+++ b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/main.c
@@ -21,7 +21,7 @@ extern int benchmark_test(void* args);
 
 /*
  *  ======== runBenchmarks ========
- *  Run the CyaSSL benchmark application
+ *  Run the wolfSSL benchmark application
  */
 void runBenchmarks(UArg arg0, UArg arg1)
 {
diff --git a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/package.bld b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/package.bld
similarity index 94%
rename from tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/package.bld
rename to tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/package.bld
index b9ddcba01..cff396855 100644
--- a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/package.bld
+++ b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/package.bld
@@ -15,7 +15,7 @@ Pkg.makePrologue = "vpath %.c $(subst ;,  ,$(XPKGPATH))";
 
 var srcs = [
     "main.c",
-    "ctaocrypt/benchmark/benchmark.c",
+    "wolfcrypt/benchmark/benchmark.c",
     "examples/boards/EK_TM4C1294XL/EK_TM4C1294XL.c",
 ];
 
@@ -42,7 +42,7 @@ for each (var targ in Build.targets) {
         targ.$orig.bspLib = "rdimon";
     }
  
-    var exeOptions = { incs: cyasslPathInclude 
+    var exeOptions = { incs: wolfsslPathInclude 
             + " -DNO_MAIN_DRIVER -D_INCLUDE_NIMU_CODE -DBENCH_EMBEDDED "
             + " -DTIVAWARE -DPART_TM4C1294NCPDT",
             lopts: lnkOpts
diff --git a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/package.xdc b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/package.xdc
new file mode 100644
index 000000000..c027f3203
--- /dev/null
+++ b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/package.xdc
@@ -0,0 +1,6 @@
+/*
+ *  ======== ti.net.wolfssl.tests.wolfcrypt.benchmark ========
+ *  wc_ Benchmark Application
+ */
+package ti.net.wolfssl.tests.wolfcrypt.benchmark {
+}
diff --git a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/TM4C1294NC.icf b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/TM4C1294NC.icf
similarity index 100%
rename from tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/TM4C1294NC.icf
rename to tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/TM4C1294NC.icf
diff --git a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/main.c b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/main.c
similarity index 72%
rename from tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/main.c
rename to tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/main.c
index 985c86c1e..41378767a 100644
--- a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/main.c
+++ b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/main.c
@@ -1,6 +1,6 @@
 /*
  *  ======== main.c ========
- *  Entry point to Ctaocrypt Test Application   
+ *  Entry point to wolfcrypt Test Application   
  */
 
 /* XDCtools Header files */
@@ -15,17 +15,17 @@ typedef struct func_args {
     int    return_code;
 } func_args;
 
-extern int ctaocrypt_test(void* args);
+extern int wolfcrypt_test(void* args);
 
 /*
- *  ======== testCtaocrypt ========
- *  Run the Ctaocrypt test
+ *  ======== testwolfcrypt ========
+ *  Run the wolfcrypt test
  */
-void testCtaocrypt(UArg arg0, UArg arg1)
+void testwolfcrypt(UArg arg0, UArg arg1)
 {
-    System_printf("Running ctaocrypt tests...\n");
+    System_printf("Running wolfcrypt tests...\n");
     System_flush();
-    ctaocrypt_test((void *)arg0);
+    wolfcrypt_test((void *)arg0);
     System_printf("Tests completed.\n");
 
     BIOS_exit(0);
@@ -45,7 +45,7 @@ int main(int argc, char** argv)
     Task_Params_init(&taskParams);
     taskParams.arg0 = (UArg)&args;
     taskParams.stackSize = 65535;
-    handle =Task_create(testCtaocrypt, &taskParams, NULL);
+    handle =Task_create(testwolfcrypt, &taskParams, NULL);
     if (handle == NULL) {
         System_printf("main: Failed to create new Task.\n");
         return (-1);
diff --git a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/package.bld b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/package.bld
similarity index 92%
rename from tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/package.bld
rename to tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/package.bld
index e1db4ff1a..a76add170 100644
--- a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/package.bld
+++ b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/package.bld
@@ -1,6 +1,6 @@
 /*
  *  ======== package.bld ========
- *  Build script for Ctaocrypt Test
+ *  Build script for wolfcrypt Test
  */
 
 if ((typeof(TivaWareDir) == undefined) || (TivaWareDir == "")) {
@@ -15,7 +15,7 @@ Pkg.makePrologue = "vpath %.c $(subst ;,  ,$(XPKGPATH))";
 
 var srcs = [
     "main.c",
-    "ctaocrypt/test/test.c",
+    "wolfcrypt/test/test.c",
     "examples/boards/EK_TM4C1294XL/EK_TM4C1294XL.c",
 ];
 
@@ -38,7 +38,7 @@ for each (var targ in Build.targets) {
         targ.$orig.bspLib = "rdimon";
     }
  
-    var exeOptions = { incs: cyasslPathInclude 
+    var exeOptions = { incs: wolfsslPathInclude 
             + " -DNO_MAIN_DRIVER -D_INCLUDE_NIMU_CODE -DBENCH_EMBEDDED "
             + " -DTIVAWARE -DPART_TM4C1294NCPDT",
             lopts: lnkOpts,
diff --git a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/package.xdc b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/package.xdc
new file mode 100644
index 000000000..8b5cc1db6
--- /dev/null
+++ b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/package.xdc
@@ -0,0 +1,6 @@
+/*
+ *  ======== ti.net.wolfssl.tests.wolfcrypt.test ========
+ *  wolfcrypt Test Application
+ */
+package ti.net.wolfssl.tests.wolfcrypt.test {
+}
diff --git a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/test.cfg b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/test.cfg
similarity index 89%
rename from tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/test.cfg
rename to tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/test.cfg
index 8c6204e26..dd8efc801 100644
--- a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/test.cfg
+++ b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/test.cfg
@@ -68,13 +68,13 @@ var TIRTOS = xdc.useModule('ti.tirtos.TIRTOS');
 TIRTOS.useEMAC = true;
 TIRTOS.useGPIO = true;
 
-/* ================ CyaSSL configuration ================ */
+/* ================ wolfSSL configuration ================ */
 try {
-    var CyaSSL = xdc.loadPackage('ti.net.cyassl');
+    var wolfSSL = xdc.loadPackage('ti.net.wolfssl');
 }
 catch (e) {
-    print("Error: Could not find CyaSSL library! Make sure the CyaSSL library"
+    print("Error: Could not find wolfSSL library! Make sure the wolfSSL library"
           + " is built and package path is updated for the build tool"
-          + " to find the library. More detailed CyaSSL build instructions"
+          + " to find the library. More detailed wolfSSL build instructions"
           + " can be found in the TI-RTOS user guide.");
 }
diff --git a/tirtos/cyassl.bld b/tirtos/wolfssl.bld
similarity index 93%
rename from tirtos/cyassl.bld
rename to tirtos/wolfssl.bld
index 4009db66d..5702b8340 100644
--- a/tirtos/cyassl.bld
+++ b/tirtos/wolfssl.bld
@@ -7,12 +7,12 @@
  * The contents of this file usually don't change, but having it in your
  * ownership allows you to tweak your compiler options.  If you do change
  * this file, however, on the next upgrade of the product we recommend
- * that you take "cyassl.bld" file as supplied by the upgrade and then merge
+ * that you take "wolfssl.bld" file as supplied by the upgrade and then merge
  * your changes with it.
  */
 
 /*
- *  ======== cyassl.bld ========
+ *  ======== wolfssl.bld ========
  *  This script is run prior to all build scripts. It sets host-system-
  *  independent values for targets and platforms, then it attempts to
  *  find the host-system-specific user.bld script that sets rootDirs.
@@ -78,7 +78,7 @@ for (arg = 0; arg < arguments.length; arg++) {
 
 /* Include Path (needed to find NDK headers) */
 var ndkPath = "$(NDK_INSTALL_DIR)/packages/ti/ndk/";
-var cyasslPathInclude = " -I" + ndkPath + "/inc/bsd -DCYASSL_TIRTOS ";
+var wolfsslPathInclude = " -I" + ndkPath + "/inc/bsd -DWOLFSSL_TIRTOS ";
 
 /* lib/ is a generated directory that 'xdc clean' should remove */
 var Pkg = xdc.useModule('xdc.bld.PackageContents'); 
diff --git a/tirtos/cyassl.mak b/tirtos/wolfssl.mak
similarity index 77%
rename from tirtos/cyassl.mak
rename to tirtos/wolfssl.mak
index 2c20b07d9..450e10aa7 100644
--- a/tirtos/cyassl.mak
+++ b/tirtos/wolfssl.mak
@@ -1,8 +1,8 @@
 #
-#  ======== cyassl.mak ========
+#  ======== wolfssl.mak ========
 #
 
-# USER OPTIONAL STEP: These variables are set when building cyassl
+# USER OPTIONAL STEP: These variables are set when building wolfssl
 # through the tirtos.mak
 # Set up dependencies
 XDC_INSTALL_DIR ?= C:/ti/xdctools_3_24_02_30
@@ -10,12 +10,12 @@ SYSBIOS_INSTALL_DIR ?= C:/ti/bios_6_34_01_14
 NDK_INSTALL_DIR ?= C:/ti/ndk_2_24_00_02
 TIRTOS_INSTALLATION_DIR ?= C:/ti/tirtos_tivac_2_00_00_22
 TivaWareDir ?= C:/ti/tivaware
-CYASSL_INSTALL_DIR ?= C:/cyassl/cyassl-2.9.4
+WOLFSSL_INSTALL_DIR ?= C:/wolfssl/wolfssl-2.9.4
 
 #
 # Set location of various cgtools
 # These variables can be set here or on the command line. These
-# variables are set when building cyassl through tirtos.mak
+# variables are set when building wolfssl through tirtos.mak
 # USER OPTIONAL STEP: user can define below paths to compilers
 ti.targets.arm.elf.M4F ?=
 
@@ -25,7 +25,7 @@ iar.targets.arm.M4F ?=
 
 #
 # Set XDCARGS to some of the variables above.  XDCARGS are passed
-# to the XDC build engine... which will load cyassl.bld... which will
+# to the XDC build engine... which will load wolfssl.bld... which will
 # extract these variables and use them to determine what to build and which
 # toolchains to use.
 #
@@ -45,7 +45,7 @@ XDCARGS= \
 #
 # Set XDCPATH to contain necessary repositories.
 #
-XDCPATH = $(SYSBIOS_INSTALL_DIR)/packages;$(NDK_INSTALL_DIR)/packages;$(CYASSL_INSTALL_DIR);$(TIRTOS_INSTALLATION_DIR)/packages;$(TivaWareDir);
+XDCPATH = $(SYSBIOS_INSTALL_DIR)/packages;$(NDK_INSTALL_DIR)/packages;$(WOLFSSL_INSTALL_DIR);$(TIRTOS_INSTALLATION_DIR)/packages;$(TivaWareDir);
 export XDCPATH
 
 #
@@ -56,19 +56,19 @@ export XDCOPTIONS
 
 #
 # Set XDC executable command
-# Note that XDCBUILDCFG points to the cyassl.bld file which uses
+# Note that XDCBUILDCFG points to the wolfssl.bld file which uses
 # the arguments specified by XDCARGS
 #
-XDC = $(XDC_INSTALL_DIR)/xdc XDCARGS="$(XDCARGS)" XDCBUILDCFG=./cyassl.bld
+XDC = $(XDC_INSTALL_DIR)/xdc XDCARGS="$(XDCARGS)" XDCBUILDCFG=./wolfssl.bld
 
 ######################################################
 ## Shouldnt have to modify anything below this line ##
 ######################################################
 
 all:
-	@ echo building cyassl packages ...
+	@ echo building wolfssl packages ...
 	@ $(XDC) -Pr ./packages
 
 clean:
-	@ echo cleaning cyassl packages ...
+	@ echo cleaning wolfssl packages ...
 	@ $(XDC) clean -Pr ./packages