diff --git a/ctaocrypt/benchmark/benchmark.c b/ctaocrypt/benchmark/benchmark.c
index 182ab17ca..05e7b685f 100644
--- a/ctaocrypt/benchmark/benchmark.c
+++ b/ctaocrypt/benchmark/benchmark.c
@@ -1500,7 +1500,7 @@ void bench_eccKeyAgree(void)
         return (double)tickCount / 1000;
     }
 
-#elif defined (TIRTOS)
+#elif defined (CYASSL_TIRTOS)
 
     extern double current_time(int reset);
 
diff --git a/ctaocrypt/src/asn.c b/ctaocrypt/src/asn.c
index eb5b18d60..0adcfe6b7 100644
--- a/ctaocrypt/src/asn.c
+++ b/ctaocrypt/src/asn.c
@@ -317,7 +317,7 @@ time_t mqx_time(time_t* timer)
 
 #endif /* FREESCALE_MQX */
 
-#ifdef TIRTOS
+#ifdef CYASSL_TIRTOS
 
 time_t XTIME(time_t * timer)
 {
@@ -331,7 +331,7 @@ time_t XTIME(time_t * timer)
     return sec;
 }
 
-#endif /* TIRTOS */
+#endif /* CYASSL_TIRTOS */
 
 static INLINE word32 btoi(byte b)
 {
diff --git a/ctaocrypt/src/random.c b/ctaocrypt/src/random.c
index 7a28fa604..4bfa3fb66 100644
--- a/ctaocrypt/src/random.c
+++ b/ctaocrypt/src/random.c
@@ -846,7 +846,7 @@ int GenerateSeed(OS_Seed* os, byte* output, word32 sz)
         return 0;
     }
 
-#elif defined(TIRTOS)
+#elif defined(CYASSL_TIRTOS)
 
     #include <xdc/runtime/Timestamp.h>
     #include <stdlib.h>
diff --git a/ctaocrypt/src/wc_port.c b/ctaocrypt/src/wc_port.c
index 7e1b584a5..179ecde72 100644
--- a/ctaocrypt/src/wc_port.c
+++ b/ctaocrypt/src/wc_port.c
@@ -352,7 +352,7 @@ int UnLockMutex(CyaSSL_Mutex *m)
                 return BAD_MUTEX_E;
         }
 
-    #elif defined (TIRTOS)
+    #elif defined (CYASSL_TIRTOS)
 
         int InitMutex(CyaSSL_Mutex* m)
         {
diff --git a/cyassl/ctaocrypt/settings.h b/cyassl/ctaocrypt/settings.h
index 87a03013b..36141a6bc 100644
--- a/cyassl/ctaocrypt/settings.h
+++ b/cyassl/ctaocrypt/settings.h
@@ -91,7 +91,7 @@
 /* #define CYASSL_IAR_ARM */
 
 /* Uncomment next line if using TI-RTOS settings */
-/* #define TIRTOS */
+/* #define CYASSL_TIRTOS */
 
 #include <cyassl/ctaocrypt/visibility.h>
 
@@ -281,7 +281,7 @@
     #endif
 #endif
 
-#ifdef TIRTOS
+#ifdef CYASSL_TIRTOS
     #define SIZEOF_LONG_LONG 8
     #define NO_WRITEV
     #define NO_CYASSL_DIR
diff --git a/cyassl/ctaocrypt/wc_port.h b/cyassl/ctaocrypt/wc_port.h
index dbe2433ad..e5e560c21 100644
--- a/cyassl/ctaocrypt/wc_port.h
+++ b/cyassl/ctaocrypt/wc_port.h
@@ -62,7 +62,7 @@
     #endif
 #elif defined(CYASSL_CMSIS_RTOS)
     #include "cmsis_os.h"    
-#elif defined(TIRTOS)
+#elif defined(CYASSL_TIRTOS)
     #include <ti/sysbios/BIOS.h>
     #include <ti/sysbios/knl/Semaphore.h>
 #else
@@ -107,7 +107,7 @@
         #endif
     #elif defined(CYASSL_CMSIS_RTOS)
         typedef osMutexId CyaSSL_Mutex;
-    #elif defined(TIRTOS)
+    #elif defined(CYASSL_TIRTOS)
         typedef ti_sysbios_knl_Semaphore_Handle CyaSSL_Mutex;
     #else
         #error Need a mutex type in multithreaded mode
diff --git a/cyassl/internal.h b/cyassl/internal.h
index beb477c1a..90c6cde74 100644
--- a/cyassl/internal.h
+++ b/cyassl/internal.h
@@ -98,7 +98,7 @@
         #include <rtl.h>
     #endif
 #elif defined(MBED)
-#elif defined(TIRTOS)
+#elif defined(CYASSL_TIRTOS)
     /* do nothing */
 #else
     #ifndef SINGLE_THREADED
diff --git a/cyassl/test.h b/cyassl/test.h
index d5de11998..244466e40 100644
--- a/cyassl/test.h
+++ b/cyassl/test.h
@@ -35,7 +35,7 @@
     #define SNPRINTF _snprintf
 #elif defined(CYASSL_MDK_ARM)
     #include <string.h>
-#elif defined(TIRTOS)
+#elif defined(CYASSL_TIRTOS)
     #include <string.h>
     #include <netdb.h>
     #include <sys/types.h>
@@ -128,7 +128,7 @@
         typedef unsigned int  THREAD_RETURN;
         typedef int           THREAD_TYPE;
         #define CYASSL_THREAD
-    #elif defined(TIRTOS)
+    #elif defined(CYASSL_TIRTOS)
         typedef void          THREAD_RETURN;
         typedef Task_Handle   THREAD_TYPE;
         #define CYASSL_THREAD
@@ -480,7 +480,7 @@ static INLINE void tcp_socket(SOCKET_T* sockfd, int udp)
 #ifdef USE_WINDOWS_API
     if (*sockfd == INVALID_SOCKET)
         err_sys("socket failed\n");
-#elif defined(TIRTOS)
+#elif defined(CYASSL_TIRTOS)
     if (*sockfd == -1)
         err_sys("socket failed\n");
 #else
@@ -497,7 +497,7 @@ static INLINE void tcp_socket(SOCKET_T* sockfd, int udp)
         if (res < 0)
             err_sys("setsockopt SO_NOSIGPIPE failed\n");
     }
-#elif defined(CYASSL_MDK_ARM) || defined (TIRTOS)
+#elif defined(CYASSL_MDK_ARM) || defined (CYASSL_TIRTOS)
     /* nothing to define */
 #else  /* no S_NOSIGPIPE */
     signal(SIGPIPE, SIG_IGN);
@@ -545,7 +545,7 @@ enum {
 };
 
 
-#if !defined(CYASSL_MDK_ARM) && !defined(TIRTOS)
+#if !defined(CYASSL_MDK_ARM) && !defined(CYASSL_TIRTOS)
 static INLINE int tcp_select(SOCKET_T socketfd, int to_sec)
 {
     fd_set recvfds, errfds;
@@ -571,7 +571,7 @@ static INLINE int tcp_select(SOCKET_T socketfd, int to_sec)
 
     return TEST_SELECT_FAIL;
 }
-#elif defined(TIRTOS)
+#elif defined(CYASSL_TIRTOS)
 static INLINE int tcp_select(SOCKET_T socketfd, int to_sec)
 {
     return TEST_RECV_READY;
@@ -686,7 +686,7 @@ static INLINE void udp_accept(SOCKET_T* sockfd, SOCKET_T* clientfd,
     pthread_cond_signal(&ready->cond);
     pthread_mutex_unlock(&ready->mutex);
     }
-#elif defined (TIRTOS)
+#elif defined (CYASSL_TIRTOS)
     /* Need mutex? */
     tcp_ready* ready = args->signal;
     ready->ready = 1;
@@ -720,7 +720,7 @@ static INLINE void tcp_accept(SOCKET_T* sockfd, SOCKET_T* clientfd,
     pthread_cond_signal(&ready->cond);
     pthread_mutex_unlock(&ready->mutex);
     }
-#elif defined (TIRTOS)
+#elif defined (CYASSL_TIRTOS)
     /* Need mutex? */
     tcp_ready* ready = args->signal;
     ready->ready = 1;
@@ -746,7 +746,7 @@ static INLINE void tcp_set_nonblocking(SOCKET_T* sockfd)
         int ret = ioctlsocket(*sockfd, FIONBIO, &blocking);
         if (ret == SOCKET_ERROR)
             err_sys("ioctlsocket failed");
-    #elif defined(CYASSL_MDK_ARM) || defined (TIRTOS)
+    #elif defined(CYASSL_MDK_ARM) || defined (CYASSL_TIRTOS)
          /* non blocking not suppported, for now */ 
     #else
         int flags = fcntl(*sockfd, F_GETFL, 0);
@@ -829,7 +829,7 @@ static INLINE unsigned int my_psk_server_cb(CYASSL* ssl, const char* identity,
         return (double)count.QuadPart / freq.QuadPart;
     }
 
-#elif defined(TIRTOS)
+#elif defined(CYASSL_TIRTOS)
     extern double current_time();
 #else
 
@@ -1088,7 +1088,7 @@ static INLINE int CurrentDir(const char* str)
 
 #elif defined(CYASSL_MDK_ARM)
     /* KEIL-RL File System does not support relative directry */
-#elif defined(TIRTOS)
+#elif defined(CYASSL_TIRTOS)
 #else
 
 #ifndef MAX_PATH
@@ -1756,7 +1756,7 @@ static INLINE void SetupPkCallbacks(CYASSL_CTX* ctx, CYASSL* ssl)
 
 
 
-#if defined(__hpux__) || defined(__MINGW32__) || defined (TIRTOS)
+#if defined(__hpux__) || defined(__MINGW32__) || defined (CYASSL_TIRTOS)
 
 /* HP/UX doesn't have strsep, needed by test/suites.c */
 static INLINE char* strsep(char **stringp, const char *delim)
diff --git a/examples/client/client.c b/examples/client/client.c
index 81fb0723c..a9dc7dcdc 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -732,7 +732,7 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
             SOCKADDR_IN_T addr;
             #ifdef USE_WINDOWS_API 
                 Sleep(500);
-            #elif defined(TIRTOS)
+            #elif defined(CYASSL_TIRTOS)
                 Task_sleep(1);
             #else
                 sleep(1);
@@ -774,7 +774,7 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
             /* give server a chance to bounce a message back to client */
             #ifdef USE_WINDOWS_API
                 Sleep(500);
-            #elif defined(TIRTOS)
+            #elif defined(CYASSL_TIRTOS)
                 Task_sleep(1);
             #else
                 sleep(1);
@@ -805,7 +805,7 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
         ShowMemoryTracker();
 #endif /* USE_CYASSL_MEMORY */
 
-#if !defined(TIRTOS)
+#if !defined(CYASSL_TIRTOS)
     return 0;
 #endif
 }
diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c
index a74bf4f40..0324c3a79 100644
--- a/examples/echoclient/echoclient.c
+++ b/examples/echoclient/echoclient.c
@@ -262,7 +262,7 @@ void echoclient_test(void* args)
 #if defined(DEBUG_CYASSL) && !defined(CYASSL_MDK_SHELL)
         CyaSSL_Debugging_ON();
 #endif
-#ifndef TIRTOS
+#ifndef CYASSL_TIRTOS
         if (CurrentDir("echoclient"))
             ChangeDirBack(2);
         else if (CurrentDir("Debug") || CurrentDir("Release"))
diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c
index 3fa078db7..422186873 100644
--- a/examples/echoserver/echoserver.c
+++ b/examples/echoserver/echoserver.c
@@ -116,15 +116,15 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
 
     #if defined(NO_MAIN_DRIVER) && !defined(USE_WINDOWS_API) && \
         !defined(CYASSL_SNIFFER) && !defined(CYASSL_MDK_SHELL) && \
-        !defined(TIRTOS)
+        !defined(CYASSL_TIRTOS)
         port = 0;
     #endif
     #if defined(USE_ANY_ADDR)
         useAnyAddr = 1;
     #endif
 
-#ifdef TIRTOS
-    fdOpenSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdOpenSession(Task_self());
 #endif
 
     tcp_listen(&sockfd, &port, useAnyAddr, doDTLS);
@@ -328,11 +328,11 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
 
     ((func_args*)args)->return_code = 0;
 
-#ifdef TIRTOS
-    fdCloseSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdCloseSession(Task_self());
 #endif
 
-#ifndef TIRTOS
+#ifndef CYASSL_TIRTOS
     return 0;
 #endif
 }
diff --git a/examples/server/server.c b/examples/server/server.c
index 3b702640d..b2be8018e 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -189,8 +189,8 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
     (void)trackMemory;
     (void)pkCallbacks;
 
-#ifdef TIRTOS
-    fdOpenSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdOpenSession(Task_self());
 #endif
 
     while ((ch = mygetopt(argc, argv, "?dbstnNufPp:v:l:A:c:k:S:oO:")) != -1) {
@@ -525,7 +525,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
         
     #if defined(CYASSL_MDK_SHELL) && defined(HAVE_MDK_RTX)
         os_dly_wait(500) ;
-    #elif defined (TIRTOS)
+    #elif defined (CYASSL_TIRTOS)
         Task_yield();
     #endif
 
@@ -541,11 +541,11 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
         ShowMemoryTracker();
 #endif /* USE_CYASSL_MEMORY */
 
-#ifdef TIRTOS
-    fdCloseSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdCloseSession(Task_self());
 #endif
 
-#ifndef TIRTOS
+#ifndef CYASSL_TIRTOS
     return 0;
 #endif
 }
diff --git a/src/internal.c b/src/internal.c
index c5005e584..84fa1d031 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -2500,7 +2500,7 @@ ProtocolVersion MakeDTLSv1_2(void)
         return (word32) mqxTime.SECONDS;
     }
 
-#elif defined(TIRTOS)
+#elif defined(CYASSL_TIRTOS)
 
     word32 LowResTimer(void)
     {
diff --git a/src/io.c b/src/io.c
index 48dbf5201..10e18fb17 100644
--- a/src/io.c
+++ b/src/io.c
@@ -69,7 +69,7 @@
         #define RNG CyaSSL_RNG 
         /* for avoiding name conflict in "stm32f2xx.h" */
         static int errno;
-    #elif defined(TIRTOS)
+    #elif defined(CYASSL_TIRTOS)
         #include <sys/socket.h>
     #elif defined(CYASSL_IAR_ARM)
         /* nothing */
diff --git a/tests/api.c b/tests/api.c
index 4cf475b52..2ae789035 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -210,7 +210,7 @@ static void test_CyaSSL_CTX_load_verify_locations(void)
     AssertFalse(CyaSSL_CTX_load_verify_locations(ctx, NULL,      0));
     AssertFalse(CyaSSL_CTX_load_verify_locations(ctx, bogusFile, 0));
 
-#ifndef TIRTOS
+#ifndef CYASSL_TIRTOS
     /* invalid path */
     /* not working... investigate! */
     /* AssertFalse(CyaSSL_CTX_load_verify_locations(ctx, caCert, bogusFile)); */
@@ -306,8 +306,8 @@ static THREAD_RETURN CYASSL_THREAD test_server_nofail(void* args)
     char input[1024];
     int idx;
 
-#ifdef TIRTOS
-    fdOpenSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdOpenSession(Task_self());
 #endif
 
     ((func_args*)args)->return_code = TEST_FAIL;
@@ -316,7 +316,7 @@ static THREAD_RETURN CYASSL_THREAD test_server_nofail(void* args)
 
 #if defined(NO_MAIN_DRIVER) && !defined(USE_WINDOWS_API) && \
    !defined(CYASSL_SNIFFER) && !defined(CYASSL_MDK_SHELL) && \
-   !defined(TIRTOS)
+   !defined(CYASSL_TIRTOS)
     port = 0;
 #endif
 
@@ -379,14 +379,14 @@ static THREAD_RETURN CYASSL_THREAD test_server_nofail(void* args)
     if (CyaSSL_write(ssl, msg, sizeof(msg)) != sizeof(msg))
     {
         /*err_sys("SSL_write failed");*/
-#ifdef TIRTOS
+#ifdef CYASSL_TIRTOS
         return;
 #else
         return 0;
 #endif
     }
 
-#ifdef TIRTOS
+#ifdef CYASSL_TIRTOS
     Task_yield();
 #endif
 
@@ -398,11 +398,11 @@ done:
     CloseSocket(clientfd);
     ((func_args*)args)->return_code = TEST_SUCCESS;
 
-#ifdef TIRTOS
-    fdCloseSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdCloseSession(Task_self());
 #endif
 
-#ifndef TIRTOS
+#ifndef CYASSL_TIRTOS
     return 0;
 #endif
 }
@@ -421,8 +421,8 @@ static void test_client_nofail(void* args)
     int  input;
     int  msgSz = (int)strlen(msg);
 
-#ifdef TIRTOS
-    fdOpenSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdOpenSession(Task_self());
 #endif
 
     ((func_args*)args)->return_code = TEST_FAIL;
@@ -486,8 +486,8 @@ done2:
     CloseSocket(sockfd);
     ((func_args*)args)->return_code = TEST_SUCCESS;
 
-#ifdef TIRTOS
-    fdCloseSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdCloseSession(Task_self());
 #endif
 
     return;
@@ -511,14 +511,14 @@ static THREAD_RETURN CYASSL_THREAD run_cyassl_server(void* args)
     char input[1024];
     int  idx;
 
-#ifdef TIRTOS
-    fdOpenSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdOpenSession(Task_self());
 #endif
     ((func_args*)args)->return_code = TEST_FAIL;
 
 #if defined(NO_MAIN_DRIVER) && !defined(USE_WINDOWS_API) && \
    !defined(CYASSL_SNIFFER) && !defined(CYASSL_MDK_SHELL) && \
-   !defined(TIRTOS)
+   !defined(CYASSL_TIRTOS)
     port = 0;
 #endif
 
@@ -572,7 +572,7 @@ static THREAD_RETURN CYASSL_THREAD run_cyassl_server(void* args)
         }
 
         AssertIntEQ(len, CyaSSL_write(ssl, msg, len));
-#ifdef TIRTOS
+#ifdef CYASSL_TIRTOS
         Task_yield();
 #endif
         CyaSSL_shutdown(ssl);
@@ -587,10 +587,10 @@ static THREAD_RETURN CYASSL_THREAD run_cyassl_server(void* args)
 
     ((func_args*)args)->return_code = TEST_SUCCESS;
 
-#ifdef TIRTOS
-    fdCloseSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdCloseSession(Task_self());
 #endif
-#ifndef TIRTOS
+#ifndef CYASSL_TIRTOS
     return 0;
 #endif
 }
@@ -609,8 +609,8 @@ static void run_cyassl_client(void* args)
     char input[1024];
     int  idx;
 
-#ifdef TIRTOS
-    fdOpenSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdOpenSession(Task_self());
 #endif
 
     ((func_args*)args)->return_code = TEST_FAIL;
@@ -660,8 +660,8 @@ static void run_cyassl_client(void* args)
     CloseSocket(sfd);
     ((func_args*)args)->return_code = TEST_SUCCESS;
 
-#ifdef TIRTOS
-    fdCloseSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdCloseSession(Task_self());
 #endif
 }
 
@@ -696,8 +696,8 @@ static void test_CyaSSL_read_write(void)
     func_args server_args;
     THREAD_TYPE serverThread;
 
-#ifdef TIRTOS
-    fdOpenSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdOpenSession(Task_self());
 #endif
 
     StartTCP();
@@ -716,8 +716,8 @@ static void test_CyaSSL_read_write(void)
 
     FreeTcpReady(&ready);
 
-#ifdef TIRTOS
-    fdOpenSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdOpenSession(Task_self());
 #endif
 
 #endif
@@ -942,8 +942,8 @@ static void test_CyaSSL_client_server(callback_functions* client_callbacks,
     client_args.callbacks = client_callbacks;
     server_args.callbacks = server_callbacks;
 
-#ifdef TIRTOS
-    fdOpenSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdOpenSession(Task_self());
 #endif
 
     /* RUN Server side */
@@ -958,8 +958,8 @@ static void test_CyaSSL_client_server(callback_functions* client_callbacks,
     join_thread(serverThread);
 
     FreeTcpReady(&ready);
-#ifdef TIRTOS
-    fdCloseSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdCloseSession(Task_self());
 #endif
     
 #else
@@ -1155,4 +1155,4 @@ void ApiTest(void)
 
     test_CyaSSL_Cleanup();
     printf(" End API Tests\n");
-}
\ No newline at end of file
+}
diff --git a/tests/suites.c b/tests/suites.c
index 0f24a2af3..61dc50544 100644
--- a/tests/suites.c
+++ b/tests/suites.c
@@ -121,7 +121,7 @@ static int execute_test_case(int svr_argc, char** svr_argv,
                               int cli_argc, char** cli_argv,
                               int addNoVerify, int addNonBlocking)
 {
-#ifdef TIRTOS
+#ifdef CYASSL_TIRTOS
     func_args cliArgs = {0};
     func_args svrArgs = {0};
     cliArgs.argc = cli_argc;
@@ -192,7 +192,7 @@ static int execute_test_case(int svr_argc, char** svr_argv,
             strcat(commandLine, flagSep);
         }
     }
-    #if !defined(USE_WINDOWS_API) && !defined(TIRTOS)
+    #if !defined(USE_WINDOWS_API) && !defined(CYASSL_TIRTOS)
         /* add port 0 */
         if (svr_argc + 2 > MAX_ARGS)
             printf("cannot add the magic port number flag to server\n");
@@ -231,15 +231,15 @@ static int execute_test_case(int svr_argc, char** svr_argv,
 
     InitTcpReady(&ready);
 
-#ifdef TIRTOS
-    fdOpenSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdOpenSession(Task_self());
 #endif
 
     /* start server */
     svrArgs.signal = &ready;
     start_thread(server_test, &svrArgs, &serverThread);
     wait_tcp_ready(&svrArgs);
-    #if !defined(USE_WINDOWS_API) && !defined(TIRTOS)
+    #if !defined(USE_WINDOWS_API) && !defined(CYASSL_TIRTOS)
         if (ready.port != 0)
         {
             if (cli_argc + 2 > MAX_ARGS)
@@ -268,8 +268,8 @@ static int execute_test_case(int svr_argc, char** svr_argv,
         exit(EXIT_FAILURE);
     }
 
-#ifdef TIRTOS
-    fdCloseSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdCloseSession(Task_self());
 #endif
     FreeTcpReady(&ready);
     
diff --git a/tests/unit.c b/tests/unit.c
index a08baf7ce..377bdabef 100644
--- a/tests/unit.c
+++ b/tests/unit.c
@@ -34,7 +34,7 @@ int unit_test(int argc, char** argv)
         err_sys("Cavium OpenNitroxDevice failed");
 #endif /* HAVE_CAVIUM */
 
-#ifndef TIRTOS
+#ifndef CYASSL_TIRTOS
     if (CurrentDir("tests") || CurrentDir("_build"))
         ChangeDirBack(1);
     else if (CurrentDir("Debug") || CurrentDir("Release"))
@@ -91,7 +91,7 @@ void start_thread(THREAD_FUNC fun, func_args* args, THREAD_TYPE* thread)
 #elif defined(_POSIX_THREADS) && !defined(__MINGW32__)
     pthread_create(thread, 0, fun, args);
     return;
-#elif defined (TIRTOS)
+#elif defined (CYASSL_TIRTOS)
     /* Initialize the defaults and set the parameters. */
     Task_Params taskParams;
     Task_Params_init(&taskParams);
@@ -114,7 +114,7 @@ void join_thread(THREAD_TYPE thread)
     (void)thread;
 #elif defined(_POSIX_THREADS) && !defined(__MINGW32__)
     pthread_join(thread, 0);
-#elif defined (TIRTOS)
+#elif defined (CYASSL_TIRTOS)
     while(1) {
         if (Task_getMode(thread) == Task_Mode_TERMINATED) {
             Task_sleep(5);
diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c
index 8b91249a6..40c7950f5 100644
--- a/testsuite/testsuite.c
+++ b/testsuite/testsuite.c
@@ -93,7 +93,7 @@ int testsuite_test(int argc, char** argv)
     CyaSSL_Debugging_ON();
 #endif
 
-#if !defined(TIRTOS)
+#if !defined(CYASSL_TIRTOS)
     if (CurrentDir("testsuite") || CurrentDir("_build"))
         ChangeDirBack(1);
     else if (CurrentDir("Debug") || CurrentDir("Release"))
@@ -103,8 +103,8 @@ int testsuite_test(int argc, char** argv)
                                    /* Debug or Release */
 #endif
 
-#ifdef TIRTOS
-    fdOpenSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdOpenSession(Task_self());
 #endif
 
     server_args.signal = &ready;
@@ -183,8 +183,8 @@ int testsuite_test(int argc, char** argv)
     CyaSSL_Cleanup();
     FreeTcpReady(&ready);
 
-#ifdef TIRTOS
-    fdCloseSession(TaskSelf());
+#ifdef CYASSL_TIRTOS
+    fdCloseSession(Task_self());
 #endif
 
 #ifdef HAVE_CAVIUM
@@ -238,7 +238,7 @@ void simple_test(func_args* args)
    
     strcpy(svrArgs.argv[0], "SimpleServer");
     #if !defined(USE_WINDOWS_API) && !defined(CYASSL_SNIFFER)  && \
-                                     !defined(TIRTOS)
+                                     !defined(CYASSL_TIRTOS)
         strcpy(svrArgs.argv[svrArgs.argc++], "-p");
         strcpy(svrArgs.argv[svrArgs.argc++], "0");
     #endif
@@ -296,7 +296,7 @@ void start_thread(THREAD_FUNC fun, func_args* args, THREAD_TYPE* thread)
 #if defined(_POSIX_THREADS) && !defined(__MINGW32__)
     pthread_create(thread, 0, fun, args);
     return;
-#elif defined(TIRTOS)
+#elif defined(CYASSL_TIRTOS)
     /* Initialize the defaults and set the parameters. */
     Task_Params taskParams;
     Task_Params_init(&taskParams);
@@ -317,7 +317,7 @@ void join_thread(THREAD_TYPE thread)
 {
 #if defined(_POSIX_THREADS) && !defined(__MINGW32__)
     pthread_join(thread, 0);
-#elif defined(TIRTOS)
+#elif defined(CYASSL_TIRTOS)
     while(1) {
         if (Task_getMode(thread) == Task_Mode_TERMINATED) {
 		    Task_sleep(5);
diff --git a/tirtos/cyassl.bld b/tirtos/cyassl.bld
index 309fe8c1a..4009db66d 100644
--- a/tirtos/cyassl.bld
+++ b/tirtos/cyassl.bld
@@ -78,8 +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" + " -I" + ndkPath 
-                        + "/inc/bsd -DTIRTOS ";
+var cyasslPathInclude = " -I" + ndkPath + "/inc/bsd -DCYASSL_TIRTOS ";
 
 /* lib/ is a generated directory that 'xdc clean' should remove */
 var Pkg = xdc.useModule('xdc.bld.PackageContents'); 
diff --git a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/package.bld b/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/package.bld
index 566f3947c..656dc50b2 100644
--- a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/package.bld
+++ b/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/benchmark/package.bld
@@ -21,13 +21,14 @@ var srcs = [
 
 for each (var targ in Build.targets) {
 
-    var lnkOpts = " -l" + TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib";
+    var lnkOpts = "";
     var platform = "ti.platforms.tiva:TM4C1294NCPDT:1";
     if (targ.$name.match(/^ti/)) {
+        lnkOpts = " -l" + TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib";
         lnkOpts += " -x ";
     }
     else if (targ.$name.match(/^iar/)) {
-       lnkOpts = TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib"
+       lnkOpts = TivaWareDir + "/driverlib/ewarm/Exe/driverlib.a"
                 + " --config TM4C1294NC.icf";
        platform = "ti.platforms.tiva:TM4C1294NCPDT";
 
@@ -35,7 +36,11 @@ for each (var targ in Build.targets) {
        var suffix = targ.$orig.lnkOpts.suffix;
        targ.$orig.lnkOpts.suffix = suffix.replace(/PrintfSmall/, "PrintfFull");
     }
-
+    else if (targ.$name.match(/^gnu/)) {
+        targ.$orig.lnkOpts.suffix += " -L" + TivaWareDir + "/driverlib/gcc " + " -Wl,--start-group -ldriver -Wl,--end-group ";
+        targ.$orig.bspLib = "rdimon";
+    }
+ 
     var exeOptions = {incs: cyasslPathInclude 
         + " -DNO_MAIN_DRIVER -D_INCLUDE_NIMU_CODE -DBENCH_EMBEDDED "
         + " -DTIVAWARE -DPART_TM4C1294NCPDT",
diff --git a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/package.bld b/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/package.bld
index 2b27a89ae..96fd4f0f5 100644
--- a/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/package.bld
+++ b/tirtos/packages/ti/net/cyassl/tests/ctaocrypt/test/package.bld
@@ -20,17 +20,23 @@ var srcs = [
            ];
 
 for each (var targ in Build.targets) {
-    var lnkOpts = " -l" + TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib"
+
+    var lnkOpts = "";
     var platform = "ti.platforms.tiva:TM4C1294NCPDT:1";
     if (targ.$name.match(/^ti/)) {
+        lnkOpts = " -l" + TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib";
         lnkOpts += " -x ";
     }
     else if (targ.$name.match(/^iar/)) {
-       lnkOpts = TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib"
+       lnkOpts = TivaWareDir + "/driverlib/ewarm/Exe/driverlib.a"
                 + " --config TM4C1294NC.icf";
        platform = "ti.platforms.tiva:TM4C1294NCPDT";
     }
-
+    else if (targ.$name.match(/^gnu/)) {
+        targ.$orig.lnkOpts.suffix += " -L" + TivaWareDir + "/driverlib/gcc " + " -Wl,--start-group -ldriver -Wl,--end-group ";
+        targ.$orig.bspLib = "rdimon";
+    }
+ 
     var exeOptions = {incs: cyasslPathInclude 
         + " -DNO_MAIN_DRIVER -D_INCLUDE_NIMU_CODE -DBENCH_EMBEDDED "
         + " -DTIVAWARE -DPART_TM4C1294NCPDT",