diff --git a/tirtos/packages/ti/net/wolfssl/package.bld b/tirtos/packages/ti/net/wolfssl/package.bld
index 95d0811ac..002cb08dc 100644
--- a/tirtos/packages/ti/net/wolfssl/package.bld
+++ b/tirtos/packages/ti/net/wolfssl/package.bld
@@ -50,7 +50,7 @@ var wolfSSLObjList = [
 
 for each (var targ in Build.targets) {
     var libOptions = {incs: wolfsslPathInclude};
-    var lib = Pkg.addLibrary("lib/" + Pkg.name, targ, libOptions);
+    var lib = Pkg.addLibrary("lib/wolfssl", targ, libOptions);
     lib.addObjects(wolfSSLObjList);
 }
 
diff --git a/tirtos/packages/ti/net/wolfssl/package.xdc b/tirtos/packages/ti/net/wolfssl/package.xdc
index f0c4b9f83..5fe467d45 100644
--- a/tirtos/packages/ti/net/wolfssl/package.xdc
+++ b/tirtos/packages/ti/net/wolfssl/package.xdc
@@ -1,7 +1,6 @@
 /*!
  *  ======== ti.net.wolfssl ========
  *  wolfSSL library for TI-RTOS
- *
  */
-package ti.net.wolfssl {
+package ti.net.wolfssl [1, 0, 0] {
 }
diff --git a/tirtos/packages/ti/net/wolfssl/package.xs b/tirtos/packages/ti/net/wolfssl/package.xs
index 9ecf38e5b..7f5215d36 100644
--- a/tirtos/packages/ti/net/wolfssl/package.xs
+++ b/tirtos/packages/ti/net/wolfssl/package.xs
@@ -8,5 +8,5 @@
  */
 function getLibs(prog) 
 {
-    return ("lib/" + this.$name + ".a" + prog.build.target.suffix);
+    return ("lib/wolfssl.a" + prog.build.target.suffix);
 }
diff --git a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/TM4C1294NC.icf b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/benchmark/TM4C1294NC.icf
similarity index 100%
rename from tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/TM4C1294NC.icf
rename to tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/benchmark/TM4C1294NC.icf
diff --git a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/benchmark.cfg b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/benchmark/benchmark.cfg
similarity index 100%
rename from tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/benchmark.cfg
rename to tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/benchmark/benchmark.cfg
diff --git a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/main.c b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/benchmark/main.c
similarity index 97%
rename from tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/main.c
rename to tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/benchmark/main.c
index 15ee1fb98..eddd432f7 100644
--- a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/main.c
+++ b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/benchmark/main.c
@@ -1,6 +1,6 @@
 /*
  *  ======== main.c ========
- *  Entry point for Benchmark application 
+ *  Entry point for Benchmark application
  */
 /* BIOS Header files */
 #include <ti/sysbios/BIOS.h>
@@ -27,7 +27,7 @@ void runBenchmarks(UArg arg0, UArg arg1)
 {
     void *args = NULL;
     msTimer_init();
-    
+
     System_printf("Running benchmarks...\n");
     System_flush();
     benchmark_test(args);
diff --git a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/package.bld b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/benchmark/package.bld
similarity index 93%
rename from tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/package.bld
rename to tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/benchmark/package.bld
index cff396855..453fee738 100644
--- a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/package.bld
+++ b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/benchmark/package.bld
@@ -10,7 +10,7 @@ if ((typeof(TivaWareDir) == undefined) || (TivaWareDir == "")) {
 var Build = xdc.useModule('xdc.bld.BuildEnvironment');
 var Pkg = xdc.useModule('xdc.bld.PackageContents');
 
-/* make command to search for the srcs */ 
+/* make command to search for the srcs */
 Pkg.makePrologue = "vpath %.c $(subst ;,  ,$(XPKGPATH))";
 
 var srcs = [
@@ -37,16 +37,16 @@ for each (var targ in Build.targets) {
         targ.$orig.lnkOpts.suffix = suffix.replace(/PrintfSmall/, "PrintfFull");
     }
     else if (targ.$name.match(/^gnu/)) {
-        targ.$orig.lnkOpts.suffix += " -L" + TivaWareDir + "/driverlib/gcc " 
+        targ.$orig.lnkOpts.suffix += " -L" + TivaWareDir + "/driverlib/gcc "
                 + " -Wl,--start-group -ldriver -Wl,--end-group ";
         targ.$orig.bspLib = "rdimon";
     }
- 
-    var exeOptions = { incs: wolfsslPathInclude 
+
+    var exeOptions = { incs: wolfsslPathInclude
             + " -DNO_MAIN_DRIVER -D_INCLUDE_NIMU_CODE -DBENCH_EMBEDDED "
             + " -DTIVAWARE -DPART_TM4C1294NCPDT",
             lopts: lnkOpts
-    };   
+    };
 
     var exe = Pkg.addExecutable("benchmark", targ, platform, exeOptions);
     exe.addObjects(srcs);
diff --git a/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/benchmark/package.xdc b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/benchmark/package.xdc
new file mode 100644
index 000000000..6a93cc333
--- /dev/null
+++ b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/benchmark/package.xdc
@@ -0,0 +1,6 @@
+/*
+ *  ======== ti.net.wolfssl.tests.EK_TM4C1294XL.wolfcrypt.benchmark ========
+ *  wc_ Benchmark Application
+ */
+package ti.net.wolfssl.tests.EK_TM4C1294XL.wolfcrypt.benchmark [1, 0, 0] {
+}
diff --git a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/TM4C1294NC.icf b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/test/TM4C1294NC.icf
similarity index 100%
rename from tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/TM4C1294NC.icf
rename to tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/test/TM4C1294NC.icf
diff --git a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/main.c b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/test/main.c
similarity index 95%
rename from tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/main.c
rename to tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/test/main.c
index 41378767a..88023e4e1 100644
--- a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/main.c
+++ b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/test/main.c
@@ -1,6 +1,6 @@
 /*
  *  ======== main.c ========
- *  Entry point to wolfcrypt Test Application   
+ *  Entry point to wolfcrypt Test Application
  */
 
 /* XDCtools Header files */
@@ -53,4 +53,3 @@ int main(int argc, char** argv)
 
     BIOS_start();
 }
-
diff --git a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/package.bld b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/test/package.bld
similarity index 92%
rename from tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/package.bld
rename to tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/test/package.bld
index a76add170..adfca1c9c 100644
--- a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/package.bld
+++ b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/test/package.bld
@@ -10,7 +10,7 @@ if ((typeof(TivaWareDir) == undefined) || (TivaWareDir == "")) {
 var Build = xdc.useModule('xdc.bld.BuildEnvironment');
 var Pkg = xdc.useModule('xdc.bld.PackageContents');
 
-/* make command to search for the srcs */ 
+/* make command to search for the srcs */
 Pkg.makePrologue = "vpath %.c $(subst ;,  ,$(XPKGPATH))";
 
 var srcs = [
@@ -33,16 +33,16 @@ for each (var targ in Build.targets) {
         platform = "ti.platforms.tiva:TM4C1294NCPDT";
     }
     else if (targ.$name.match(/^gnu/)) {
-        targ.$orig.lnkOpts.suffix += " -L" + TivaWareDir + "/driverlib/gcc " 
+        targ.$orig.lnkOpts.suffix += " -L" + TivaWareDir + "/driverlib/gcc "
                 + " -Wl,--start-group -ldriver -Wl,--end-group ";
         targ.$orig.bspLib = "rdimon";
     }
- 
-    var exeOptions = { incs: wolfsslPathInclude 
+
+    var exeOptions = { incs: wolfsslPathInclude
             + " -DNO_MAIN_DRIVER -D_INCLUDE_NIMU_CODE -DBENCH_EMBEDDED "
             + " -DTIVAWARE -DPART_TM4C1294NCPDT",
             lopts: lnkOpts,
-    };   
+    };
 
     var exe = Pkg.addExecutable("test", targ, platform, exeOptions);
     exe.addObjects(srcs);
diff --git a/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/test/package.xdc b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/test/package.xdc
new file mode 100644
index 000000000..0b85d5786
--- /dev/null
+++ b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/test/package.xdc
@@ -0,0 +1,6 @@
+/*
+ *  ======== ti.net.wolfssl.tests.EK_TM4C1294XL.wolfcrypt.test ========
+ *  wolfcrypt Test Application
+ */
+package ti.net.wolfssl.tests.EK_TM4C1294XL.wolfcrypt.test [1, 0, 0] {
+}
diff --git a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/test.cfg b/tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/test/test.cfg
similarity index 100%
rename from tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/test.cfg
rename to tirtos/packages/ti/net/wolfssl/tests/EK_TM4C1294XL/wolfcrypt/test/test.cfg
diff --git a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/package.xdc b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/package.xdc
deleted file mode 100644
index c027f3203..000000000
--- a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/benchmark/package.xdc
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  ======== ti.net.wolfssl.tests.wolfcrypt.benchmark ========
- *  wc_ Benchmark Application
- */
-package ti.net.wolfssl.tests.wolfcrypt.benchmark {
-}
diff --git a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/package.xdc b/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/package.xdc
deleted file mode 100644
index 8b5cc1db6..000000000
--- a/tirtos/packages/ti/net/wolfssl/tests/wolfcrypt/test/package.xdc
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  ======== ti.net.wolfssl.tests.wolfcrypt.test ========
- *  wolfcrypt Test Application
- */
-package ti.net.wolfssl.tests.wolfcrypt.test {
-}
diff --git a/tirtos/wolfssl.bld b/tirtos/wolfssl.bld
index 5702b8340..696208ba0 100644
--- a/tirtos/wolfssl.bld
+++ b/tirtos/wolfssl.bld
@@ -32,21 +32,24 @@
  */
 
 var armOpts = " -ms ";
-var gnuOpts = "";
+var gnuOpts = " -D_POSIX_SOURCE ";
 var iarOpts = "";
 
 /* Uncomment the following lines to build libraries for debug mode: */
 // Pkg.attrs.profile = "debug";
 // armOpts += " -g -o0 ";
-// gnuOpts += " -g ";
+// gnuOpts += " -g -D_POSIX_SOURCE ";
 // iarOpts += " --debug ";
 
 var ccOpts = {
-    "ti.targets.arm.elf.M4F"        : armOpts,
+    "ti.targets.arm.elf.M4"        : armOpts,
+    "ti.targets.arm.elf.M4F"       : armOpts,
 
-    "gnu.targets.arm.M4F"           : gnuOpts,
+    "gnu.targets.arm.M4"           : gnuOpts,
+    "gnu.targets.arm.M4F"          : gnuOpts,
 
-    "iar.targets.arm.M4F"           : iarOpts,
+    "iar.targets.arm.M4"           : iarOpts,
+    "iar.targets.arm.M4F"          : iarOpts,
 };
 
 /* initialize local vars with those set in xdcpaths.mak (via XDCARGS) */