diff --git a/base-hw/src/core/kernel/irq.cc b/base-hw/src/core/kernel/irq.cc
index 2e6edb430f..7f8b27c52f 100644
--- a/base-hw/src/core/kernel/irq.cc
+++ b/base-hw/src/core/kernel/irq.cc
@@ -12,7 +12,7 @@
  */
 
 /* core includes */
-#include <kernel/multiprocessor.h>
+#include <kernel/processor.h>
 #include <kernel/irq.h>
 #include <pic.h>
 
diff --git a/base-hw/src/core/kernel/pd.h b/base-hw/src/core/kernel/pd.h
index abf914f1d3..1ab3d50add 100644
--- a/base-hw/src/core/kernel/pd.h
+++ b/base-hw/src/core/kernel/pd.h
@@ -20,7 +20,7 @@
 /* core includes */
 #include <kernel/configuration.h>
 #include <kernel/object.h>
-#include <kernel/multiprocessor.h>
+#include <kernel/processor.h>
 #include <tlb.h>
 #include <assert.h>
 
diff --git a/base-hw/src/core/kernel/multiprocessor.cc b/base-hw/src/core/kernel/processor.cc
similarity index 78%
rename from base-hw/src/core/kernel/multiprocessor.cc
rename to base-hw/src/core/kernel/processor.cc
index 6c4ee0e3a0..2634703ee8 100644
--- a/base-hw/src/core/kernel/multiprocessor.cc
+++ b/base-hw/src/core/kernel/processor.cc
@@ -1,5 +1,5 @@
 /*
- * \brief   Representation of a common instruction processor
+ * \brief   Provide a processor object for every available processor
  * \author  Martin Stein
  * \date    2014-01-14
  */
@@ -12,7 +12,7 @@
  */
 
 /* core includes */
-#include <kernel/multiprocessor.h>
+#include <kernel/processor.h>
 
 using namespace Kernel;
 
diff --git a/base-hw/src/core/kernel/multiprocessor.h b/base-hw/src/core/kernel/processor.h
similarity index 96%
rename from base-hw/src/core/kernel/multiprocessor.h
rename to base-hw/src/core/kernel/processor.h
index 626437559a..44d80cea78 100644
--- a/base-hw/src/core/kernel/multiprocessor.h
+++ b/base-hw/src/core/kernel/processor.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__MULTIPROCESSOR_H_
-#define _KERNEL__MULTIPROCESSOR_H_
+#ifndef _KERNEL__PROCESSOR_H_
+#define _KERNEL__PROCESSOR_H_
 
 /* base includes */
 #include <unmanaged_singleton.h>
@@ -149,4 +149,4 @@ class Kernel::Multiprocessor
 		}
 };
 
-#endif /* _KERNEL__MULTIPROCESSOR_H_ */
+#endif /* _KERNEL__PROCESSOR_H_ */
diff --git a/base-hw/src/core/kernel/scheduler.cc b/base-hw/src/core/kernel/scheduler.cc
index f0b413a5c0..508616e63d 100644
--- a/base-hw/src/core/kernel/scheduler.cc
+++ b/base-hw/src/core/kernel/scheduler.cc
@@ -12,8 +12,7 @@
  */
 
 /* core includes */
-#include <kernel/scheduler.h>
-#include <kernel/multiprocessor.h>
+#include <kernel/processor.h>
 #include <kernel/irq.h>
 #include <pic.h>
 #include <timer.h>
diff --git a/base-hw/src/core/kernel/vm.h b/base-hw/src/core/kernel/vm.h
index 4558580307..c29ab518fe 100644
--- a/base-hw/src/core/kernel/vm.h
+++ b/base-hw/src/core/kernel/vm.h
@@ -21,7 +21,7 @@
 #include <kernel/scheduler.h>
 #include <kernel/kernel.h>
 #include <kernel/pd.h>
-#include <kernel/multiprocessor.h>
+#include <kernel/processor.h>
 #include <kernel/signal_receiver.h>
 
 namespace Kernel
diff --git a/base-hw/src/core/target.inc b/base-hw/src/core/target.inc
index a1120827b9..17beb827ea 100644
--- a/base-hw/src/core/target.inc
+++ b/base-hw/src/core/target.inc
@@ -53,7 +53,7 @@ SRC_CC += console.cc \
           kernel/signal_receiver.cc \
           kernel/irq.cc \
           kernel/scheduler.cc \
-          kernel/multiprocessor.cc \
+          kernel/processor.cc \
           rm_session_support.cc \
           trustzone.cc \
           pager.cc \