4 files changed, 10 insertions, 10 deletions
diff --git a/c/src/exec/score/cpu/i386/asm.h b/c/src/exec/score/cpu/i386/asm.h
index aac1ba9dbe..e317161043 100644
--- a/c/src/exec/score/cpu/i386/asm.h
+++ b/c/src/exec/score/cpu/i386/asm.h
@@ -31,7 +31,7 @@
  */
 
 #define ASM
-#include <rtems/core/i386.h>
+#include <rtems/score/i386.h>
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the
diff --git a/c/src/exec/score/cpu/i386/cpu.c b/c/src/exec/score/cpu/i386/cpu.c
index e23313a9ad..917cf042a9 100644
--- a/c/src/exec/score/cpu/i386/cpu.c
+++ b/c/src/exec/score/cpu/i386/cpu.c
@@ -14,8 +14,8 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/wkspace.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/wkspace.h>
 
 /*  _CPU_Initialize
  *
diff --git a/c/src/exec/score/cpu/i386/cpu.h b/c/src/exec/score/cpu/i386/cpu.h
index f173d0cdc7..2ac3b1970c 100644
--- a/c/src/exec/score/cpu/i386/cpu.h
+++ b/c/src/exec/score/cpu/i386/cpu.h
@@ -22,9 +22,9 @@ extern "C" {
 #endif
 
 #ifndef ASM
-#include <rtems/core/i386types.h>
+#include <rtems/score/i386types.h>
 #endif
-#include <rtems/core/i386.h>
+#include <rtems/score/i386.h>
 
 /* conditional compilation parameters */
 
diff --git a/c/src/exec/score/cpu/i386/i386.h b/c/src/exec/score/cpu/i386/i386.h
index 1832d4142e..8cb246aa91 100644
--- a/c/src/exec/score/cpu/i386/i386.h
+++ b/c/src/exec/score/cpu/i386/i386.h
@@ -65,27 +65,27 @@ extern "C" {
 
 #if defined(i386_fp)
 
-#define RTEMS_MODEL_NAME  "i386 with i387"
+#define CPU_MODEL_NAME  "i386 with i387"
 #define I386_HAS_FPU 1
 
 #elif defined(i386_nofp)
 
-#define RTEMS_MODEL_NAME  "i386 w/o i387"
+#define CPU_MODEL_NAME  "i386 w/o i387"
 #define I386_HAS_FPU 1
 
 #elif defined(i486dx)
 
-#define RTEMS_MODEL_NAME  "i486dx"
+#define CPU_MODEL_NAME  "i486dx"
 #define I386_HAS_FPU 1
 
 #elif defined(i486sx)
 
-#define RTEMS_MODEL_NAME  "i486sx"
+#define CPU_MODEL_NAME  "i486sx"
 #define I386_HAS_FPU 0
 
 #elif defined(pentium)
 
-#define RTEMS_MODEL_NAME  "Pentium"
+#define CPU_MODEL_NAME  "Pentium"
 #define I386_HAS_FPU 1
 
 #else