diff --git a/IDE/IAR-EWARM/Projects/CyaSSL-Lib/CyaSSL-Lib.ewp b/IDE/IAR-EWARM/Projects/CyaSSL-Lib/CyaSSL-Lib.ewp
index 8602d4e66..bc278a468 100644
--- a/IDE/IAR-EWARM/Projects/CyaSSL-Lib/CyaSSL-Lib.ewp
+++ b/IDE/IAR-EWARM/Projects/CyaSSL-Lib/CyaSSL-Lib.ewp
@@ -1965,7 +1965,7 @@
       <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\misc.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\port.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\wc_port.c</name>
     </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\ctaocrypt\src\pwdbased.c</name>
diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvopt b/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvopt
index 4814980e2..1e83de18e 100644
--- a/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvopt
+++ b/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvopt
@@ -1539,8 +1539,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\ctaocrypt\src\port.c</PathWithFileName>
-      <FilenameWithoutPath>port.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\ctaocrypt\src\wc_port.c</PathWithFileName>
+      <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvproj b/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvproj
index eefd970ea..6504d782a 100644
--- a/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvproj
+++ b/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvproj
@@ -726,9 +726,9 @@
               <FilePath>..\..\..\ctaocrypt\src\misc.c</FilePath>
             </File>
             <File>
-              <FileName>port.c</FileName>
+              <FileName>wc_port.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\ctaocrypt\src\port.c</FilePath>
+              <FilePath>..\..\..\ctaocrypt\src\wc_port.c</FilePath>
             </File>
             <File>
               <FileName>pwdbased.c</FileName>
@@ -1970,9 +1970,9 @@
               </FileOption>
             </File>
             <File>
-              <FileName>port.c</FileName>
+              <FileName>wc_port.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\ctaocrypt\src\port.c</FilePath>
+              <FilePath>..\..\..\ctaocrypt\src\wc_port.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -3267,9 +3267,9 @@
               </FileOption>
             </File>
             <File>
-              <FileName>port.c</FileName>
+              <FileName>wc_port.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\ctaocrypt\src\port.c</FilePath>
+              <FilePath>..\..\..\ctaocrypt\src\wc_port.c</FilePath>
             </File>
           </Files>
         </Group>
diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt
index ddc1a5000..f051310b2 100644
--- a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt
+++ b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt
@@ -1294,8 +1294,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\ctaocrypt\src\port.c</PathWithFileName>
-      <FilenameWithoutPath>port.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\ctaocrypt\src\wc_port.c</PathWithFileName>
+      <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj
index 833dc0d1b..f7cf9b176 100644
--- a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj
+++ b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj
@@ -704,9 +704,9 @@
               <FilePath>..\..\..\ctaocrypt\src\misc.c</FilePath>
             </File>
             <File>
-              <FileName>port.c</FileName>
+              <FileName>wc_port.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\ctaocrypt\src\port.c</FilePath>
+              <FilePath>..\..\..\ctaocrypt\src\wc_port.c</FilePath>
             </File>
             <File>
               <FileName>pwdbased.c</FileName>
@@ -2121,9 +2121,9 @@
               <FilePath>..\..\..\ctaocrypt\src\misc.c</FilePath>
             </File>
             <File>
-              <FileName>port.c</FileName>
+              <FileName>wc_port.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\ctaocrypt\src\port.c</FilePath>
+              <FilePath>..\..\..\ctaocrypt\src\wc_port.c</FilePath>
             </File>
             <File>
               <FileName>pwdbased.c</FileName>
@@ -3636,9 +3636,9 @@
               <FilePath>..\..\..\ctaocrypt\src\misc.c</FilePath>
             </File>
             <File>
-              <FileName>port.c</FileName>
+              <FileName>wc_port.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\ctaocrypt\src\port.c</FilePath>
+              <FilePath>..\..\..\ctaocrypt\src\wc_port.c</FilePath>
             </File>
             <File>
               <FileName>pwdbased.c</FileName>
diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx
index d5106490f..4217560bf 100644
--- a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx
+++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx
@@ -1015,8 +1015,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
-      <FilenameWithoutPath>port.c</FilenameWithoutPath>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</PathWithFileName>
+      <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx
index 47b0e21aa..6382ff2c5 100644
--- a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx
+++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx
@@ -670,9 +670,9 @@
               <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath>
             </File>
             <File>
-              <FileName>port.c</FileName>
+              <FileName>wc_port.c</FileName>
               <FileType>1</FileType>
-              <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</FilePath>
+              <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</FilePath>
             </File>
             <File>
               <FileName>pwdbased.c</FileName>
diff --git a/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvoptx b/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvoptx
index 0f4bcddf2..3d3905ab1 100644
--- a/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvoptx
+++ b/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvoptx
@@ -977,8 +977,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
-      <FilenameWithoutPath>port.c</FilenameWithoutPath>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</PathWithFileName>
+      <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvprojx b/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvprojx
index 89b16583d..2f9123d53 100644
--- a/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvprojx
+++ b/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvprojx
@@ -660,9 +660,9 @@
               <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath>
             </File>
             <File>
-              <FileName>port.c</FileName>
+              <FileName>wc_port.c</FileName>
               <FileType>1</FileType>
-              <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</FilePath>
+              <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</FilePath>
             </File>
             <File>
               <FileName>pwdbased.c</FileName>
diff --git a/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx b/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx
index 714391aa7..ab0d90db3 100644
--- a/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx
+++ b/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx
@@ -1339,8 +1339,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
-      <FilenameWithoutPath>port.c</FilenameWithoutPath>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</PathWithFileName>
+      <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvprojx b/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvprojx
index 9f4bea3a6..dc54ce825 100644
--- a/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvprojx
+++ b/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvprojx
@@ -770,9 +770,9 @@
               <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath>
             </File>
             <File>
-              <FileName>port.c</FileName>
+              <FileName>wc_port.c</FileName>
               <FileType>1</FileType>
-              <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</FilePath>
+              <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</FilePath>
             </File>
             <File>
               <FileName>pwdbased.c</FileName>
diff --git a/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvoptx b/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvoptx
index 903ee3cac..d00990d89 100644
--- a/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvoptx
+++ b/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvoptx
@@ -1151,8 +1151,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
-      <FilenameWithoutPath>port.c</FilenameWithoutPath>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</PathWithFileName>
+      <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvprojx b/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvprojx
index 9083e5569..67ac6f0b2 100644
--- a/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvprojx
+++ b/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvprojx
@@ -715,9 +715,9 @@
               <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath>
             </File>
             <File>
-              <FileName>port.c</FileName>
+              <FileName>wc_port.c</FileName>
               <FileType>1</FileType>
-              <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</FilePath>
+              <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</FilePath>
             </File>
             <File>
               <FileName>pwdbased.c</FileName>
diff --git a/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvoptx b/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvoptx
index 242215bf9..3f4dfdad1 100644
--- a/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvoptx
+++ b/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvoptx
@@ -1151,8 +1151,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
-      <FilenameWithoutPath>port.c</FilenameWithoutPath>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</PathWithFileName>
+      <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvprojx b/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvprojx
index 0c2c83673..76471d0ae 100644
--- a/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvprojx
+++ b/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvprojx
@@ -715,9 +715,9 @@
               <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath>
             </File>
             <File>
-              <FileName>port.c</FileName>
+              <FileName>wc_port.c</FileName>
               <FileType>1</FileType>
-              <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</FilePath>
+              <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</FilePath>
             </File>
             <File>
               <FileName>pwdbased.c</FileName>
diff --git a/IDE/MDK5-ARM/Projects/SimpleClient/SimpleClient.uvoptx b/IDE/MDK5-ARM/Projects/SimpleClient/SimpleClient.uvoptx
index bdd17d798..2ac3a7211 100644
--- a/IDE/MDK5-ARM/Projects/SimpleClient/SimpleClient.uvoptx
+++ b/IDE/MDK5-ARM/Projects/SimpleClient/SimpleClient.uvoptx
@@ -1215,8 +1215,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
-      <FilenameWithoutPath>port.c</FilenameWithoutPath>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</PathWithFileName>
+      <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/IDE/MDK5-ARM/Projects/SimpleClient/simpleClient.uvprojx b/IDE/MDK5-ARM/Projects/SimpleClient/simpleClient.uvprojx
index efee3c0c8..4cc8e2149 100644
--- a/IDE/MDK5-ARM/Projects/SimpleClient/simpleClient.uvprojx
+++ b/IDE/MDK5-ARM/Projects/SimpleClient/simpleClient.uvprojx
@@ -735,9 +735,9 @@
               <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath>
             </File>
             <File>
-              <FileName>port.c</FileName>
+              <FileName>wc_port.c</FileName>
               <FileType>1</FileType>
-              <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</FilePath>
+              <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</FilePath>
             </File>
             <File>
               <FileName>pwdbased.c</FileName>
diff --git a/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvoptx b/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvoptx
index dcd3ae74a..c667014f0 100644
--- a/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvoptx
+++ b/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvoptx
@@ -1199,8 +1199,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
-      <FilenameWithoutPath>port.c</FilenameWithoutPath>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</PathWithFileName>
+      <FilenameWithoutPath>wc_port.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvprojx b/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvprojx
index 156a9906d..77f3f876f 100644
--- a/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvprojx
+++ b/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvprojx
@@ -730,9 +730,9 @@
               <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</FilePath>
             </File>
             <File>
-              <FileName>port.c</FileName>
+              <FileName>wc_port.c</FileName>
               <FileType>1</FileType>
-              <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</FilePath>
+              <FilePath>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c</FilePath>
             </File>
             <File>
               <FileName>pwdbased.c</FileName>
diff --git a/ctaocrypt/ctaocrypt.vcproj b/ctaocrypt/ctaocrypt.vcproj
index 2ae9046d5..d07147d57 100755
--- a/ctaocrypt/ctaocrypt.vcproj
+++ b/ctaocrypt/ctaocrypt.vcproj
@@ -297,7 +297,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\src\port.c"
+				RelativePath=".\src\wc_port.c"
 				>
 			</File>
 			<File
diff --git a/ctaocrypt/src/port.c b/ctaocrypt/src/wc_port.c
similarity index 100%
rename from ctaocrypt/src/port.c
rename to ctaocrypt/src/wc_port.c
diff --git a/cyassl-ntru.vcproj b/cyassl-ntru.vcproj
index 0813acdc7..bf3c04cbb 100755
--- a/cyassl-ntru.vcproj
+++ b/cyassl-ntru.vcproj
@@ -251,7 +251,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\ctaocrypt\src\port.c"
+				RelativePath=".\ctaocrypt\src\wc_port.c"
 				>
 			</File>
 			<File
diff --git a/cyassl.vcproj b/cyassl.vcproj
index 7005e3aaf..ed5e30eca 100755
--- a/cyassl.vcproj
+++ b/cyassl.vcproj
@@ -244,7 +244,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\ctaocrypt\src\port.c"
+				RelativePath=".\ctaocrypt\src\wc_port.c"
 				>
 			</File>
 			<File
diff --git a/cyassl.vcxproj b/cyassl.vcxproj
index c5e4ee872..ea7dd5eaa 100644
--- a/cyassl.vcxproj
+++ b/cyassl.vcxproj
@@ -154,7 +154,7 @@
     <ClCompile Include="ctaocrypt\src\md5.c" />
     <ClCompile Include="ctaocrypt\src\memory.c" />
     <ClCompile Include="src\ocsp.c" />
-    <ClCompile Include="ctaocrypt\src\port.c" />
+    <ClCompile Include="ctaocrypt\src\wc_port.c" />
     <ClCompile Include="ctaocrypt\src\pwdbased.c" />
     <ClCompile Include="ctaocrypt\src\rabbit.c" />
     <ClCompile Include="ctaocrypt\src\random.c" />
@@ -179,4 +179,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/cyassl/ctaocrypt/include.am b/cyassl/ctaocrypt/include.am
index 8165af42c..b3cf210a4 100644
--- a/cyassl/ctaocrypt/include.am
+++ b/cyassl/ctaocrypt/include.am
@@ -23,7 +23,7 @@ nobase_include_HEADERS+= \
                          cyassl/ctaocrypt/md5.h \
                          cyassl/ctaocrypt/misc.h \
                          cyassl/ctaocrypt/pkcs7.h \
-                         cyassl/ctaocrypt/port.h \
+                         cyassl/ctaocrypt/wc_port.h \
                          cyassl/ctaocrypt/pwdbased.h \
                          cyassl/ctaocrypt/rabbit.h \
                          cyassl/ctaocrypt/random.h \
diff --git a/cyassl/ctaocrypt/types.h b/cyassl/ctaocrypt/types.h
index 194b50b76..33cdb780e 100644
--- a/cyassl/ctaocrypt/types.h
+++ b/cyassl/ctaocrypt/types.h
@@ -24,7 +24,7 @@
 #define CTAO_CRYPT_TYPES_H
 
 #include <cyassl/ctaocrypt/settings.h>
-#include <cyassl/ctaocrypt/port.h>
+#include <cyassl/ctaocrypt/wc_port.h>
 
 #ifdef __cplusplus
     extern "C" {
diff --git a/cyassl/ctaocrypt/port.h b/cyassl/ctaocrypt/wc_port.h
similarity index 100%
rename from cyassl/ctaocrypt/port.h
rename to cyassl/ctaocrypt/wc_port.h
diff --git a/mcapi/cyassl.X/nbproject/configurations.xml b/mcapi/cyassl.X/nbproject/configurations.xml
index 7837eed08..8eafc4c55 100644
--- a/mcapi/cyassl.X/nbproject/configurations.xml
+++ b/mcapi/cyassl.X/nbproject/configurations.xml
@@ -52,7 +52,7 @@
       <itemPath>../../mcapi/crypto.c</itemPath>
       <itemPath>../../ctaocrypt/src/compress.c</itemPath>
       <itemPath>../../ctaocrypt/src/camellia.c</itemPath>
-      <itemPath>../../ctaocrypt/src/port.c</itemPath>
+      <itemPath>../../ctaocrypt/src/wc_port.c</itemPath>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
diff --git a/mplabx/ctaocrypt_benchmark.X/nbproject/configurations.xml b/mplabx/ctaocrypt_benchmark.X/nbproject/configurations.xml
index 13faa6bc4..89dad9242 100644
--- a/mplabx/ctaocrypt_benchmark.X/nbproject/configurations.xml
+++ b/mplabx/ctaocrypt_benchmark.X/nbproject/configurations.xml
@@ -34,7 +34,7 @@
         <targetPluginBoard></targetPluginBoard>
         <platformTool>PKOBSKDEPlatformTool</platformTool>
         <languageToolchain>XC32</languageToolchain>
-        <languageToolchainVersion>1.30</languageToolchainVersion>
+        <languageToolchainVersion>1.10</languageToolchainVersion>
         <platform>3</platform>
       </toolsSet>
       <compileType>
diff --git a/mplabx/ctaocrypt_benchmark.X/nbproject/project.xml b/mplabx/ctaocrypt_benchmark.X/nbproject/project.xml
index e87963a96..131e4cf97 100644
--- a/mplabx/ctaocrypt_benchmark.X/nbproject/project.xml
+++ b/mplabx/ctaocrypt_benchmark.X/nbproject/project.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://www.netbeans.org/ns/project/1">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
     <type>com.microchip.mplab.nbide.embedded.makeproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/make-project/1">
@@ -9,6 +10,7 @@
             <cpp-extensions/>
             <header-extensions/>
             <sourceEncoding>ISO-8859-1</sourceEncoding>
+            <asminc-extensions/>
             <make-dep-projects>
                 <make-dep-project>../cyassl.X</make-dep-project>
             </make-dep-projects>
diff --git a/mplabx/ctaocrypt_test.X/nbproject/configurations.xml b/mplabx/ctaocrypt_test.X/nbproject/configurations.xml
index 7ffe44c26..284040b81 100644
--- a/mplabx/ctaocrypt_test.X/nbproject/configurations.xml
+++ b/mplabx/ctaocrypt_test.X/nbproject/configurations.xml
@@ -35,7 +35,7 @@
         <targetPluginBoard></targetPluginBoard>
         <platformTool>PKOBSKDEPlatformTool</platformTool>
         <languageToolchain>XC32</languageToolchain>
-        <languageToolchainVersion>1.30</languageToolchainVersion>
+        <languageToolchainVersion>1.10</languageToolchainVersion>
         <platform>3</platform>
       </toolsSet>
       <compileType>
diff --git a/mplabx/ctaocrypt_test.X/nbproject/project.xml b/mplabx/ctaocrypt_test.X/nbproject/project.xml
index 82180e826..1f0921a97 100644
--- a/mplabx/ctaocrypt_test.X/nbproject/project.xml
+++ b/mplabx/ctaocrypt_test.X/nbproject/project.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://www.netbeans.org/ns/project/1">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
     <type>com.microchip.mplab.nbide.embedded.makeproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/make-project/1">
@@ -9,6 +10,7 @@
             <cpp-extensions/>
             <header-extensions>h</header-extensions>
             <sourceEncoding>ISO-8859-1</sourceEncoding>
+            <asminc-extensions/>
             <make-dep-projects>
                 <make-dep-project>../cyassl.X</make-dep-project>
             </make-dep-projects>
diff --git a/mplabx/cyassl.X/nbproject/configurations.xml b/mplabx/cyassl.X/nbproject/configurations.xml
index 1a141bb22..85dc8dead 100644
--- a/mplabx/cyassl.X/nbproject/configurations.xml
+++ b/mplabx/cyassl.X/nbproject/configurations.xml
@@ -49,7 +49,7 @@
       <itemPath>../../ctaocrypt/src/sha256.c</itemPath>
       <itemPath>../../ctaocrypt/src/sha512.c</itemPath>
       <itemPath>../../ctaocrypt/src/tfm.c</itemPath>
-      <itemPath>../../ctaocrypt/src/port.c</itemPath>
+      <itemPath>../../ctaocrypt/src/wc_port.c</itemPath>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
@@ -72,7 +72,7 @@
         <targetPluginBoard></targetPluginBoard>
         <platformTool>PKOBSKDEPlatformTool</platformTool>
         <languageToolchain>XC32</languageToolchain>
-        <languageToolchainVersion>1.30</languageToolchainVersion>
+        <languageToolchainVersion>1.10</languageToolchainVersion>
         <platform>3</platform>
       </toolsSet>
       <compileType>
diff --git a/mplabx/cyassl.X/nbproject/project.xml b/mplabx/cyassl.X/nbproject/project.xml
index c7604d711..a3711bf2d 100644
--- a/mplabx/cyassl.X/nbproject/project.xml
+++ b/mplabx/cyassl.X/nbproject/project.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://www.netbeans.org/ns/project/1">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
     <type>com.microchip.mplab.nbide.embedded.makeproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/make-project/1">
@@ -9,6 +10,7 @@
             <cpp-extensions/>
             <header-extensions/>
             <sourceEncoding>ISO-8859-1</sourceEncoding>
+            <asminc-extensions/>
             <make-dep-projects/>
         </data>
     </configuration>
diff --git a/rpm/spec.in b/rpm/spec.in
index 97d8e5722..9435c6cfa 100644
--- a/rpm/spec.in
+++ b/rpm/spec.in
@@ -106,7 +106,7 @@ mkdir -p $RPM_BUILD_ROOT/
 %{_includedir}/cyassl/ctaocrypt/mpi_class.h
 %{_includedir}/cyassl/ctaocrypt/mpi_superclass.h
 %{_includedir}/cyassl/ctaocrypt/pkcs7.h
-%{_includedir}/cyassl/ctaocrypt/port.h
+%{_includedir}/cyassl/ctaocrypt/wc_port.h
 %{_includedir}/cyassl/ctaocrypt/pwdbased.h
 %{_includedir}/cyassl/ctaocrypt/rabbit.h
 %{_includedir}/cyassl/ctaocrypt/random.h
diff --git a/src/include.am b/src/include.am
index ba5010588..d4a32684b 100644
--- a/src/include.am
+++ b/src/include.am
@@ -19,7 +19,7 @@ src_libcyassl_la_SOURCES += \
                ctaocrypt/src/random.c \
                ctaocrypt/src/sha256.c \
                ctaocrypt/src/logging.c \
-               ctaocrypt/src/port.c \
+               ctaocrypt/src/wc_port.c \
                ctaocrypt/src/error.c
 src_libcyassl_la_LDFLAGS = ${AM_LDFLAGS} -no-undefined -version-info ${CYASSL_LIBRARY_VERSION}
 src_libcyassl_la_LIBADD = $(LIBM)