Index: uspace/srv/loader/arch/amd64/Makefile.inc
===================================================================
--- uspace/srv/loader/arch/amd64/Makefile.inc	(revision 59b2adb4808ec5724445deaa809570893f7fa924)
+++ uspace/srv/loader/arch/amd64/Makefile.inc	(revision fa024ce932aff7f238e5cabadb9fdd510c75fca9)
@@ -28,3 +28,3 @@
 
 CFLAGS += -D__64_BITS__
-ARCH_SOURCES := arch/$(ARCH)/amd64.s
+ARCH_SOURCES := arch/$(UARCH)/amd64.s
Index: uspace/srv/loader/arch/amd64/_link.ld.in
===================================================================
--- uspace/srv/loader/arch/amd64/_link.ld.in	(revision 59b2adb4808ec5724445deaa809570893f7fa924)
+++ uspace/srv/loader/arch/amd64/_link.ld.in	(revision fa024ce932aff7f238e5cabadb9fdd510c75fca9)
@@ -1,3 +1,3 @@
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/srv/loader/arch/arm32/Makefile.inc
===================================================================
--- uspace/srv/loader/arch/arm32/Makefile.inc	(revision 59b2adb4808ec5724445deaa809570893f7fa924)
+++ uspace/srv/loader/arch/arm32/Makefile.inc	(revision fa024ce932aff7f238e5cabadb9fdd510c75fca9)
@@ -28,3 +28,3 @@
 
 CFLAGS += -D__32_BITS__
-ARCH_SOURCES := arch/$(ARCH)/arm32.s
+ARCH_SOURCES := arch/$(UARCH)/arm32.s
Index: uspace/srv/loader/arch/arm32/_link.ld.in
===================================================================
--- uspace/srv/loader/arch/arm32/_link.ld.in	(revision 59b2adb4808ec5724445deaa809570893f7fa924)
+++ uspace/srv/loader/arch/arm32/_link.ld.in	(revision fa024ce932aff7f238e5cabadb9fdd510c75fca9)
@@ -1,7 +1,7 @@
-/* 
+/*
  * The only difference from _link.ld.in for regular statically-linked apps
  * is the base address.
  */
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/srv/loader/arch/ia32/Makefile.inc
===================================================================
--- uspace/srv/loader/arch/ia32/Makefile.inc	(revision 59b2adb4808ec5724445deaa809570893f7fa924)
+++ uspace/srv/loader/arch/ia32/Makefile.inc	(revision fa024ce932aff7f238e5cabadb9fdd510c75fca9)
@@ -28,3 +28,3 @@
 
 CFLAGS += -D__32_BITS__
-ARCH_SOURCES := arch/$(ARCH)/ia32.s
+ARCH_SOURCES := arch/$(UARCH)/ia32.s
Index: uspace/srv/loader/arch/ia32/_link.ld.in
===================================================================
--- uspace/srv/loader/arch/ia32/_link.ld.in	(revision 59b2adb4808ec5724445deaa809570893f7fa924)
+++ uspace/srv/loader/arch/ia32/_link.ld.in	(revision fa024ce932aff7f238e5cabadb9fdd510c75fca9)
@@ -1,7 +1,7 @@
-/* 
+/*
  * The difference from _link.ld.in for regular statically-linked apps
  * is the base address and the special interp section.
  */
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/srv/loader/arch/ia64/Makefile.inc
===================================================================
--- uspace/srv/loader/arch/ia64/Makefile.inc	(revision 59b2adb4808ec5724445deaa809570893f7fa924)
+++ uspace/srv/loader/arch/ia64/Makefile.inc	(revision fa024ce932aff7f238e5cabadb9fdd510c75fca9)
@@ -28,4 +28,4 @@
 
 CFLAGS += -D__64_BITS__
-ARCH_SOURCES := arch/$(ARCH)/ia64.s
+ARCH_SOURCES := arch/$(UARCH)/ia64.s
 AFLAGS += -xexplicit
Index: uspace/srv/loader/arch/ia64/_link.ld.in
===================================================================
--- uspace/srv/loader/arch/ia64/_link.ld.in	(revision 59b2adb4808ec5724445deaa809570893f7fa924)
+++ uspace/srv/loader/arch/ia64/_link.ld.in	(revision fa024ce932aff7f238e5cabadb9fdd510c75fca9)
@@ -1,3 +1,3 @@
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/srv/loader/arch/mips32/Makefile.inc
===================================================================
--- uspace/srv/loader/arch/mips32/Makefile.inc	(revision 59b2adb4808ec5724445deaa809570893f7fa924)
+++ uspace/srv/loader/arch/mips32/Makefile.inc	(revision fa024ce932aff7f238e5cabadb9fdd510c75fca9)
@@ -28,3 +28,3 @@
 
 CFLAGS += -D__32_BITS__
-ARCH_SOURCES := arch/$(ARCH)/mips32.s
+ARCH_SOURCES := arch/$(UARCH)/mips32.s
Index: uspace/srv/loader/arch/mips32/_link.ld.in
===================================================================
--- uspace/srv/loader/arch/mips32/_link.ld.in	(revision 59b2adb4808ec5724445deaa809570893f7fa924)
+++ uspace/srv/loader/arch/mips32/_link.ld.in	(revision fa024ce932aff7f238e5cabadb9fdd510c75fca9)
@@ -1,7 +1,7 @@
-/* 
+/*
  * The only difference from _link.ld.in for regular statically-linked apps
  * is the base address.
  */
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/srv/loader/arch/ppc32/Makefile.inc
===================================================================
--- uspace/srv/loader/arch/ppc32/Makefile.inc	(revision 59b2adb4808ec5724445deaa809570893f7fa924)
+++ uspace/srv/loader/arch/ppc32/Makefile.inc	(revision fa024ce932aff7f238e5cabadb9fdd510c75fca9)
@@ -28,3 +28,3 @@
 
 CFLAGS += -D__32_BITS__
-ARCH_SOURCES := arch/$(ARCH)/ppc32.s
+ARCH_SOURCES := arch/$(UARCH)/ppc32.s
Index: uspace/srv/loader/arch/ppc32/_link.ld.in
===================================================================
--- uspace/srv/loader/arch/ppc32/_link.ld.in	(revision 59b2adb4808ec5724445deaa809570893f7fa924)
+++ uspace/srv/loader/arch/ppc32/_link.ld.in	(revision fa024ce932aff7f238e5cabadb9fdd510c75fca9)
@@ -1,7 +1,7 @@
-/* 
+/*
  * The only difference from _link.ld.in for regular statically-linked apps
  * is the base address.
  */
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/srv/loader/arch/sparc64/Makefile.inc
===================================================================
--- uspace/srv/loader/arch/sparc64/Makefile.inc	(revision 59b2adb4808ec5724445deaa809570893f7fa924)
+++ uspace/srv/loader/arch/sparc64/Makefile.inc	(revision fa024ce932aff7f238e5cabadb9fdd510c75fca9)
@@ -28,3 +28,3 @@
 
 CFLAGS += -D__64_BITS__
-ARCH_SOURCES := arch/$(ARCH)/sparc64.s
+ARCH_SOURCES := arch/$(UARCH)/sparc64.s
Index: uspace/srv/loader/arch/sparc64/_link.ld.in
===================================================================
--- uspace/srv/loader/arch/sparc64/_link.ld.in	(revision 59b2adb4808ec5724445deaa809570893f7fa924)
+++ uspace/srv/loader/arch/sparc64/_link.ld.in	(revision fa024ce932aff7f238e5cabadb9fdd510c75fca9)
@@ -1,3 +1,3 @@
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)