diff --git a/repos/base-hw/lib/mk/arm/core.inc b/repos/base-hw/lib/mk/arm/core.inc
index c092259a8a..f87d78bf66 100644
--- a/repos/base-hw/lib/mk/arm/core.inc
+++ b/repos/base-hw/lib/mk/arm/core.inc
@@ -8,7 +8,7 @@
 INC_DIR += $(REP_DIR)/src/core/include/spec/arm
 
 # add C++ sources
-SRC_CC += spec/arm/cpu_support.cc
+SRC_CC += spec/arm/kernel/thread_base.cc
 
 # add assembly sources
 SRC_S += spec/arm/crt0.s
diff --git a/repos/base-hw/src/core/include/kernel/thread.h b/repos/base-hw/src/core/include/kernel/thread.h
index 0bc5fc1f84..46b654b25a 100644
--- a/repos/base-hw/src/core/include/kernel/thread.h
+++ b/repos/base-hw/src/core/include/kernel/thread.h
@@ -19,7 +19,7 @@
 #include <kernel/signal_receiver.h>
 #include <kernel/ipc_node.h>
 #include <kernel/processor.h>
-#include <cpu_support.h>
+#include <kernel/thread_base.h>
 
 namespace Kernel
 {
@@ -75,7 +75,7 @@ class Kernel::Thread
 	public Ipc_node,
 	public Signal_context_killer,
 	public Signal_handler,
-	public Thread_cpu_support
+	public Thread_base
 {
 	friend class Thread_event;
 
diff --git a/repos/base-hw/src/core/include/spec/arm/cpu_support.h b/repos/base-hw/src/core/include/spec/arm/kernel/thread_base.h
similarity index 66%
rename from repos/base-hw/src/core/include/spec/arm/cpu_support.h
rename to repos/base-hw/src/core/include/spec/arm/kernel/thread_base.h
index 9eed27ca05..55ccb4954e 100644
--- a/repos/base-hw/src/core/include/spec/arm/cpu_support.h
+++ b/repos/base-hw/src/core/include/spec/arm/kernel/thread_base.h
@@ -1,5 +1,5 @@
 /*
- * \brief   CPU specific support for base-hw
+ * \brief   Hardware specific base of kernel thread-objects
  * \author  Martin Stein
  * \date    2013-11-13
  */
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CPU_SUPPORT_H_
-#define _CPU_SUPPORT_H_
+#ifndef _KERNEL__THREAD_BASE_H_
+#define _KERNEL__THREAD_BASE_H_
 
 /* core includes */
 #include <kernel/thread_event.h>
@@ -20,12 +20,12 @@
 namespace Kernel
 {
 	/**
-	 * CPU specific parts of a kernel thread-object
+	 * Hardware specific base of kernel thread-objects
 	 */
-	class Thread_cpu_support;
+	class Thread_base;
 }
 
-class Kernel::Thread_cpu_support
+class Kernel::Thread_base
 {
 	protected:
 
@@ -40,7 +40,7 @@ class Kernel::Thread_cpu_support
 		 *
 		 * \param t  generic part of kernel thread-object
 		 */
-		Thread_cpu_support(Thread * const t);
+		Thread_base(Thread * const t);
 };
 
-#endif /* _CPU_SUPPORT_H_ */
+#endif /* _KERNEL__THREAD_BASE_H_ */
diff --git a/repos/base-hw/src/core/kernel/thread.cc b/repos/base-hw/src/core/kernel/thread.cc
index d53ae9850a..4c48ff0a72 100644
--- a/repos/base-hw/src/core/kernel/thread.cc
+++ b/repos/base-hw/src/core/kernel/thread.cc
@@ -148,7 +148,7 @@ void Thread::_unschedule(State const s)
 Thread::Thread(unsigned const priority, char const * const label)
 :
 	Processor_client(0, priority),
-	Thread_cpu_support(this),
+	Thread_base(this),
 	_state(AWAITS_START),
 	_pd(0),
 	_utcb_phys(0),
diff --git a/repos/base-hw/src/core/spec/arm/cpu_support.cc b/repos/base-hw/src/core/spec/arm/kernel/thread_base.cc
similarity index 94%
rename from repos/base-hw/src/core/spec/arm/cpu_support.cc
rename to repos/base-hw/src/core/spec/arm/kernel/thread_base.cc
index dd10cdd856..474b010e5b 100644
--- a/repos/base-hw/src/core/spec/arm/cpu_support.cc
+++ b/repos/base-hw/src/core/spec/arm/kernel/thread_base.cc
@@ -19,11 +19,11 @@
 using namespace Kernel;
 
 
-/********************************
- ** Kernel::Thread_cpu_support **
- ********************************/
+/*************************
+ ** Kernel::Thread_base **
+ *************************/
 
-Thread_cpu_support::Thread_cpu_support(Thread * const t)
+Thread_base::Thread_base(Thread * const t)
 :
 	_fault(t),
 	_fault_pd(0),