diff --git a/demos/device/device_os_none/device_os_none.ewp b/demos/device/device_os_none/device_os_none.ewp
index 28fe4126..73f2d002 100644
--- a/demos/device/device_os_none/device_os_none.ewp
+++ b/demos/device/device_os_none/device_os_none.ewp
@@ -4796,7 +4796,7 @@
     <group>
       <name>common</name>
       <file>
-        <name>$PROJ_DIR$\..\..\..\tinyusb\common\errors.c</name>
+        <name>$PROJ_DIR$\..\..\..\tinyusb\common\tusb_errors.c</name>
       </file>
       <file>
         <name>$PROJ_DIR$\..\..\..\tinyusb\common\fifo.c</name>
diff --git a/demos/device/device_os_none/device_os_none.uvopt b/demos/device/device_os_none/device_os_none.uvopt
index f522d8bc..e51ad3d7 100644
--- a/demos/device/device_os_none/device_os_none.uvopt
+++ b/demos/device/device_os_none/device_os_none.uvopt
@@ -489,7 +489,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>8</CpuCode>
       <DllOpt>
@@ -630,7 +630,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>8</CpuCode>
       <Books>
@@ -1231,8 +1231,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\tinyusb\common\errors.c</PathWithFileName>
-      <FilenameWithoutPath>errors.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\tinyusb\common\tusb_errors.c</PathWithFileName>
+      <FilenameWithoutPath>tusb_errors.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/demos/device/device_os_none/device_os_none.uvproj b/demos/device/device_os_none/device_os_none.uvproj
index d1be63cb..97a1b9e7 100644
--- a/demos/device/device_os_none/device_os_none.uvproj
+++ b/demos/device/device_os_none/device_os_none.uvproj
@@ -487,9 +487,9 @@
               <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath>
             </File>
             <File>
-              <FileName>errors.c</FileName>
+              <FileName>tusb_errors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\tinyusb\common\errors.c</FilePath>
+              <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath>
             </File>
             <File>
               <FileName>fifo.c</FileName>
@@ -1394,9 +1394,9 @@
               <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath>
             </File>
             <File>
-              <FileName>errors.c</FileName>
+              <FileName>tusb_errors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\tinyusb\common\errors.c</FilePath>
+              <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath>
             </File>
             <File>
               <FileName>fifo.c</FileName>
@@ -2341,9 +2341,9 @@
               <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath>
             </File>
             <File>
-              <FileName>errors.c</FileName>
+              <FileName>tusb_errors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\tinyusb\common\errors.c</FilePath>
+              <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath>
             </File>
             <File>
               <FileName>fifo.c</FileName>
@@ -3248,9 +3248,9 @@
               <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath>
             </File>
             <File>
-              <FileName>errors.c</FileName>
+              <FileName>tusb_errors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\tinyusb\common\errors.c</FilePath>
+              <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath>
             </File>
             <File>
               <FileName>fifo.c</FileName>
@@ -4155,9 +4155,9 @@
               <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath>
             </File>
             <File>
-              <FileName>errors.c</FileName>
+              <FileName>tusb_errors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\tinyusb\common\errors.c</FilePath>
+              <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath>
             </File>
             <File>
               <FileName>fifo.c</FileName>
@@ -5102,9 +5102,9 @@
               <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath>
             </File>
             <File>
-              <FileName>errors.c</FileName>
+              <FileName>tusb_errors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\tinyusb\common\errors.c</FilePath>
+              <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath>
             </File>
             <File>
               <FileName>fifo.c</FileName>
diff --git a/demos/host/host_freertos/host_freertos.ewp b/demos/host/host_freertos/host_freertos.ewp
index a2c0fc67..efcdffe2 100644
--- a/demos/host/host_freertos/host_freertos.ewp
+++ b/demos/host/host_freertos/host_freertos.ewp
@@ -2961,7 +2961,7 @@
     <group>
       <name>common</name>
       <file>
-        <name>$PROJ_DIR$\..\..\..\tinyusb\common\errors.c</name>
+        <name>$PROJ_DIR$\..\..\..\tinyusb\common\tusb_errors.c</name>
       </file>
     </group>
     <group>
diff --git a/demos/host/host_freertos/host_freertos.uvproj b/demos/host/host_freertos/host_freertos.uvproj
index e53f8964..ad1a3dd9 100644
--- a/demos/host/host_freertos/host_freertos.uvproj
+++ b/demos/host/host_freertos/host_freertos.uvproj
@@ -482,9 +482,9 @@
               <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath>
             </File>
             <File>
-              <FileName>errors.c</FileName>
+              <FileName>tusb_errors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\tinyusb\common\errors.c</FilePath>
+              <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath>
             </File>
             <File>
               <FileName>fifo.c</FileName>
@@ -1312,9 +1312,9 @@
               <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath>
             </File>
             <File>
-              <FileName>errors.c</FileName>
+              <FileName>tusb_errors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\tinyusb\common\errors.c</FilePath>
+              <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath>
             </File>
             <File>
               <FileName>fifo.c</FileName>
@@ -2142,9 +2142,9 @@
               <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath>
             </File>
             <File>
-              <FileName>errors.c</FileName>
+              <FileName>tusb_errors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\tinyusb\common\errors.c</FilePath>
+              <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath>
             </File>
             <File>
               <FileName>fifo.c</FileName>
@@ -2972,9 +2972,9 @@
               <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath>
             </File>
             <File>
-              <FileName>errors.c</FileName>
+              <FileName>tusb_errors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\tinyusb\common\errors.c</FilePath>
+              <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath>
             </File>
             <File>
               <FileName>fifo.c</FileName>
diff --git a/demos/host/host_os_none/host_os_none.ewp b/demos/host/host_os_none/host_os_none.ewp
index c0515d83..281b906c 100644
--- a/demos/host/host_os_none/host_os_none.ewp
+++ b/demos/host/host_os_none/host_os_none.ewp
@@ -2903,7 +2903,7 @@
     <group>
       <name>common</name>
       <file>
-        <name>$PROJ_DIR$\..\..\..\tinyusb\common\errors.c</name>
+        <name>$PROJ_DIR$\..\..\..\tinyusb\common\tusb_errors.c</name>
       </file>
     </group>
     <group>
diff --git a/demos/host/host_os_none/host_os_none.uvopt b/demos/host/host_os_none/host_os_none.uvopt
index 083fddd6..439ae827 100644
--- a/demos/host/host_os_none/host_os_none.uvopt
+++ b/demos/host/host_os_none/host_os_none.uvopt
@@ -1114,7 +1114,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>32</TopLine>
+      <TopLine>33</TopLine>
       <CurrentLine>38</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</PathWithFileName>
@@ -1133,8 +1133,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\tinyusb\common\errors.c</PathWithFileName>
-      <FilenameWithoutPath>errors.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\tinyusb\common\tusb_errors.c</PathWithFileName>
+      <FilenameWithoutPath>tusb_errors.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1162,7 +1162,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>15</TopLine>
+      <TopLine>16</TopLine>
       <CurrentLine>34</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\tinyusb\class\cdc_host.c</PathWithFileName>
@@ -1306,7 +1306,7 @@
       <Focus>0</Focus>
       <ColumnNumber>15</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>3</TopLine>
+      <TopLine>4</TopLine>
       <CurrentLine>10</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\tinyusb\host\ohci\ohci.c</PathWithFileName>
@@ -1754,7 +1754,7 @@
       <Focus>0</Focus>
       <ColumnNumber>35</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>74</TopLine>
+      <TopLine>75</TopLine>
       <CurrentLine>86</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</PathWithFileName>
diff --git a/demos/host/host_os_none/host_os_none.uvproj b/demos/host/host_os_none/host_os_none.uvproj
index 734b6bbf..ed010829 100644
--- a/demos/host/host_os_none/host_os_none.uvproj
+++ b/demos/host/host_os_none/host_os_none.uvproj
@@ -482,9 +482,9 @@
               <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath>
             </File>
             <File>
-              <FileName>errors.c</FileName>
+              <FileName>tusb_errors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\tinyusb\common\errors.c</FilePath>
+              <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath>
             </File>
             <File>
               <FileName>fifo.c</FileName>
@@ -1247,9 +1247,9 @@
               <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath>
             </File>
             <File>
-              <FileName>errors.c</FileName>
+              <FileName>tusb_errors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\tinyusb\common\errors.c</FilePath>
+              <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath>
             </File>
             <File>
               <FileName>fifo.c</FileName>
@@ -2012,9 +2012,9 @@
               <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath>
             </File>
             <File>
-              <FileName>errors.c</FileName>
+              <FileName>tusb_errors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\tinyusb\common\errors.c</FilePath>
+              <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath>
             </File>
             <File>
               <FileName>fifo.c</FileName>
@@ -2777,9 +2777,9 @@
               <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath>
             </File>
             <File>
-              <FileName>errors.c</FileName>
+              <FileName>tusb_errors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\tinyusb\common\errors.c</FilePath>
+              <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath>
             </File>
             <File>
               <FileName>fifo.c</FileName>
diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h
index a24887b2..b63593ac 100644
--- a/tinyusb/common/common.h
+++ b/tinyusb/common/common.h
@@ -73,7 +73,7 @@
 #include "compiler/compiler.h"
 #include "assertion.h"
 #include "binary.h"
-#include "errors.h"
+#include "tusb_errors.h"
 
 //------------- TUSB Header -------------//
 #include "tusb_types.h"
diff --git a/tinyusb/common/errors.c b/tinyusb/common/tusb_errors.c
similarity index 96%
rename from tinyusb/common/errors.c
rename to tinyusb/common/tusb_errors.c
index 00fc5784..e0848a96 100644
--- a/tinyusb/common/errors.c
+++ b/tinyusb/common/tusb_errors.c
@@ -36,7 +36,7 @@
 */
 /**************************************************************************/
 
-#include "errors.h"
+#include "tusb_errors.h"
 
 #if TUSB_CFG_DEBUG == 3
 
diff --git a/tinyusb/common/errors.h b/tinyusb/common/tusb_errors.h
similarity index 96%
rename from tinyusb/common/errors.h
rename to tinyusb/common/tusb_errors.h
index c4314370..1d1424fd 100644
--- a/tinyusb/common/errors.h
+++ b/tinyusb/common/tusb_errors.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*!
-    @file     errors.h
+    @file     tusb_errors.h
     @author   hathach (tinyusb.org)
 
     @section LICENSE
diff --git a/tinyusb/hal/hal.h b/tinyusb/hal/hal.h
index e2090765..9170f3f5 100644
--- a/tinyusb/hal/hal.h
+++ b/tinyusb/hal/hal.h
@@ -53,7 +53,7 @@
 //--------------------------------------------------------------------+
 #include "tusb_option.h"
 #include "common/primitive_types.h"
-#include "common/errors.h"
+#include "common/tusb_errors.h"
 #include "common/compiler/compiler.h"
 
 //--------------------------------------------------------------------+