diff --git a/configure/os/CONFIG.Common.RTEMS b/configure/os/CONFIG.Common.RTEMS
index 1cfe0fe56..b19b2071f 100644
--- a/configure/os/CONFIG.Common.RTEMS
+++ b/configure/os/CONFIG.Common.RTEMS
@@ -108,14 +108,14 @@ endif
 
 OP_SYS_LDLIBS_posix_NET_yes = -ltftpfs -lnfs -lz -ltelnetd
 OP_SYS_LDLIBS_posix_NET_no = -ltftpfs -lbsd -lz
-OP_SYS_LDLIBS_kernel_NET_yes = -lnfs
-OP_SYS_LDLIBS_kernel_NET_no = -lnfs
+OP_SYS_LDLIBS_score_NET_yes = -lnfs
+OP_SYS_LDLIBS_score_NET_no = -lnfs
 OP_SYS_LDLIBS += -lrtemsCom -lCom
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(OS_API)_NET_$(RTEMS_HAS_NETWORKING))
 OP_SYS_LDLIBS += -lrtemscpu -lc -lm
 
 OP_SYS_LDFLAGS_posix = -u POSIX_Init
-OP_SYS_LDFLAGS_kernel = -u Init \
+OP_SYS_LDFLAGS_score = -u Init \
                  $(PROJECT_RELEASE)/lib/no-dpmem.rel \
                  $(PROJECT_RELEASE)/lib/no-mp.rel \
                  $(PROJECT_RELEASE)/lib/no-part.rel \
diff --git a/configure/toolchain.c b/configure/toolchain.c
index 3120d4fdc..a97085ae3 100644
--- a/configure/toolchain.c
+++ b/configure/toolchain.c
@@ -32,6 +32,6 @@ MSVC_VER = _MSC_VER
 #  if __RTEMS_MAJOR__>=5
 OS_API = posix
 #  else
-OS_API = kernel
+OS_API = score
 #  endif
 #endif
diff --git a/modules/libcom/RTEMS/kernel/rtems_config.c b/modules/libcom/RTEMS/score/rtems_config.c
similarity index 100%
rename from modules/libcom/RTEMS/kernel/rtems_config.c
rename to modules/libcom/RTEMS/score/rtems_config.c
diff --git a/modules/libcom/RTEMS/kernel/rtems_init.c b/modules/libcom/RTEMS/score/rtems_init.c
similarity index 100%
rename from modules/libcom/RTEMS/kernel/rtems_init.c
rename to modules/libcom/RTEMS/score/rtems_init.c
diff --git a/modules/libcom/src/osi/os/RTEMS-posix/devLibVMEOSD.c b/modules/libcom/src/osi/os/RTEMS-posix/devLibVMEOSD.c
index c83c338d9..3d93a07ae 100644
--- a/modules/libcom/src/osi/os/RTEMS-posix/devLibVMEOSD.c
+++ b/modules/libcom/src/osi/os/RTEMS-posix/devLibVMEOSD.c
@@ -1,6 +1,6 @@
 #ifdef RTEMS_LEGACY_STACK
-#include "../RTEMS-kernel/devLibVMEOSD.c"
+#include "os/RTEMS-score/devLibVMEOSD.c"
 #else
-#pragma message "\n VME-Support only with RTEMS Legacy stack\n" 
-#include "../default/devLibVMEOSD.c"
+#pragma message "\n VME Support requires the RTEMS Legacy stack\n" 
+#include "default/devLibVMEOSD.c"
 #endif
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/devLibVMEOSD.c b/modules/libcom/src/osi/os/RTEMS-score/devLibVMEOSD.c
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/devLibVMEOSD.c
rename to modules/libcom/src/osi/os/RTEMS-score/devLibVMEOSD.c
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/epicsAtomicOSD.cpp b/modules/libcom/src/osi/os/RTEMS-score/epicsAtomicOSD.cpp
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/epicsAtomicOSD.cpp
rename to modules/libcom/src/osi/os/RTEMS-score/epicsAtomicOSD.cpp
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/epicsAtomicOSD.h b/modules/libcom/src/osi/os/RTEMS-score/epicsAtomicOSD.h
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/epicsAtomicOSD.h
rename to modules/libcom/src/osi/os/RTEMS-score/epicsAtomicOSD.h
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/epicsMath.h b/modules/libcom/src/osi/os/RTEMS-score/epicsMath.h
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/epicsMath.h
rename to modules/libcom/src/osi/os/RTEMS-score/epicsMath.h
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdEvent.c b/modules/libcom/src/osi/os/RTEMS-score/osdEvent.c
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdEvent.c
rename to modules/libcom/src/osi/os/RTEMS-score/osdEvent.c
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdEvent.h b/modules/libcom/src/osi/os/RTEMS-score/osdEvent.h
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdEvent.h
rename to modules/libcom/src/osi/os/RTEMS-score/osdEvent.h
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdFindSymbol.c b/modules/libcom/src/osi/os/RTEMS-score/osdFindSymbol.c
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdFindSymbol.c
rename to modules/libcom/src/osi/os/RTEMS-score/osdFindSymbol.c
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdMutex.c b/modules/libcom/src/osi/os/RTEMS-score/osdMutex.c
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdMutex.c
rename to modules/libcom/src/osi/os/RTEMS-score/osdMutex.c
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdMutex.h b/modules/libcom/src/osi/os/RTEMS-score/osdMutex.h
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdMutex.h
rename to modules/libcom/src/osi/os/RTEMS-score/osdMutex.h
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdPoolStatus.c b/modules/libcom/src/osi/os/RTEMS-score/osdPoolStatus.c
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdPoolStatus.c
rename to modules/libcom/src/osi/os/RTEMS-score/osdPoolStatus.c
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdProcess.c b/modules/libcom/src/osi/os/RTEMS-score/osdProcess.c
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdProcess.c
rename to modules/libcom/src/osi/os/RTEMS-score/osdProcess.c
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdReadline.c b/modules/libcom/src/osi/os/RTEMS-score/osdReadline.c
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdReadline.c
rename to modules/libcom/src/osi/os/RTEMS-score/osdReadline.c
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdSignal.cpp b/modules/libcom/src/osi/os/RTEMS-score/osdSignal.cpp
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdSignal.cpp
rename to modules/libcom/src/osi/os/RTEMS-score/osdSignal.cpp
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdSock.h b/modules/libcom/src/osi/os/RTEMS-score/osdSock.h
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdSock.h
rename to modules/libcom/src/osi/os/RTEMS-score/osdSock.h
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdSpin.c b/modules/libcom/src/osi/os/RTEMS-score/osdSpin.c
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdSpin.c
rename to modules/libcom/src/osi/os/RTEMS-score/osdSpin.c
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdStrtod.h b/modules/libcom/src/osi/os/RTEMS-score/osdStrtod.h
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdStrtod.h
rename to modules/libcom/src/osi/os/RTEMS-score/osdStrtod.h
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdThread.c b/modules/libcom/src/osi/os/RTEMS-score/osdThread.c
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdThread.c
rename to modules/libcom/src/osi/os/RTEMS-score/osdThread.c
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdThread.h b/modules/libcom/src/osi/os/RTEMS-score/osdThread.h
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdThread.h
rename to modules/libcom/src/osi/os/RTEMS-score/osdThread.h
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdThreadExtra.c b/modules/libcom/src/osi/os/RTEMS-score/osdThreadExtra.c
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdThreadExtra.c
rename to modules/libcom/src/osi/os/RTEMS-score/osdThreadExtra.c
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdTime.cpp b/modules/libcom/src/osi/os/RTEMS-score/osdTime.cpp
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdTime.cpp
rename to modules/libcom/src/osi/os/RTEMS-score/osdTime.cpp
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdTime.h b/modules/libcom/src/osi/os/RTEMS-score/osdTime.h
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osdTime.h
rename to modules/libcom/src/osi/os/RTEMS-score/osdTime.h
diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osiUnistd.h b/modules/libcom/src/osi/os/RTEMS-score/osiUnistd.h
similarity index 100%
rename from modules/libcom/src/osi/os/RTEMS-kernel/osiUnistd.h
rename to modules/libcom/src/osi/os/RTEMS-score/osiUnistd.h