diff --git a/build/libraries/os/ARM7/Makefile b/build/libraries/os/ARM7/Makefile
index 0435be4..de5def2 100644
--- a/build/libraries/os/ARM7/Makefile
+++ b/build/libraries/os/ARM7/Makefile
@@ -32,15 +32,15 @@ SRCDIR			+= $(TWL_NITROSDK_ROOT)/build/libraries/os/common/src \
                    $(TWL_NITROSDK_ROOT)/build/libraries/os/ARM7/src \
 
 SRCS			= \
-			  os_init_twl.c		\
-			  os_interrupt_twl.c	\
-			  os_irqHandler_twl.c	\
-			  os_irqTable_twl.c		\
-			  os_spinLock_twl.c		\
-			  os_printf_twl.c		\
-			  os_system_twl.c		\
-			  os_entropy_twl.c		\
-			  os_terminate_twl_sp.c \
+			  os_init.c		\
+			  os_interrupt.c	\
+			  os_irqHandler.c	\
+			  os_irqTable.c		\
+			  os_spinLock.c		\
+			  os_printf.c		\
+			  os_system.c		\
+			  os_entropy.c		\
+			  os_terminate_sp.c \
 			  os_thread.c		\
 			  os_context.c		\
 			  os_emulator.c		\
diff --git a/build/libraries/os/ARM7/os_terminate_twl_sp.c b/build/libraries/os/ARM7/os_terminate_sp.c
similarity index 100%
rename from build/libraries/os/ARM7/os_terminate_twl_sp.c
rename to build/libraries/os/ARM7/os_terminate_sp.c
diff --git a/build/libraries/os/ARM9/Makefile b/build/libraries/os/ARM9/Makefile
index 4cb6e36..4f840f5 100644
--- a/build/libraries/os/ARM9/Makefile
+++ b/build/libraries/os/ARM9/Makefile
@@ -38,14 +38,14 @@ SRCDIR			+= $(TWL_NITROSDK_ROOT)/build/libraries/os/common/src \
                    $(TWL_NITROSDK_ROOT)/build/libraries/os/ARM9/src \
 
 SRCS			= \
-			  os_init_twl.c		\
-			  os_interrupt_twl.c	\
-			  os_irqHandler_twl.c	\
-			  os_irqTable_twl.c		\
-			  os_spinLock_twl.c		\
-			  os_printf_twl.c		\
-			  os_system_twl.c		\
-			  os_entropy_twl.c		\
+			  os_init.c		\
+			  os_interrupt.c	\
+			  os_irqHandler.c	\
+			  os_irqTable.c		\
+			  os_spinLock.c		\
+			  os_printf.c		\
+			  os_system.c		\
+			  os_entropy.c		\
 			  os_thread.c		\
 			  os_context.c		\
 			  os_emulator.c		\
diff --git a/build/libraries/os/common/os_entropy_twl.c b/build/libraries/os/common/os_entropy.c
similarity index 100%
rename from build/libraries/os/common/os_entropy_twl.c
rename to build/libraries/os/common/os_entropy.c
diff --git a/build/libraries/os/common/os_init_twl.c b/build/libraries/os/common/os_init.c
similarity index 100%
rename from build/libraries/os/common/os_init_twl.c
rename to build/libraries/os/common/os_init.c
diff --git a/build/libraries/os/common/os_interrupt_twl.c b/build/libraries/os/common/os_interrupt.c
similarity index 100%
rename from build/libraries/os/common/os_interrupt_twl.c
rename to build/libraries/os/common/os_interrupt.c
diff --git a/build/libraries/os/common/os_irqHandler_twl.c b/build/libraries/os/common/os_irqHandler.c
similarity index 100%
rename from build/libraries/os/common/os_irqHandler_twl.c
rename to build/libraries/os/common/os_irqHandler.c
diff --git a/build/libraries/os/common/os_irqTable_twl.c b/build/libraries/os/common/os_irqTable.c
similarity index 100%
rename from build/libraries/os/common/os_irqTable_twl.c
rename to build/libraries/os/common/os_irqTable.c
diff --git a/build/libraries/os/common/os_printf_twl.c b/build/libraries/os/common/os_printf.c
similarity index 100%
rename from build/libraries/os/common/os_printf_twl.c
rename to build/libraries/os/common/os_printf.c
diff --git a/build/libraries/os/common/os_spinLock_twl.c b/build/libraries/os/common/os_spinLock.c
similarity index 100%
rename from build/libraries/os/common/os_spinLock_twl.c
rename to build/libraries/os/common/os_spinLock.c
diff --git a/build/libraries/os/common/os_system_twl.c b/build/libraries/os/common/os_system.c
similarity index 100%
rename from build/libraries/os/common/os_system_twl.c
rename to build/libraries/os/common/os_system.c