3 files changed, 12 insertions, 12 deletions
diff --git a/c/src/exec/score/cpu/powerpc/cpu.c b/c/src/exec/score/cpu/powerpc/cpu.c
index 0d4b94e4be..1f8c40f274 100644
--- a/c/src/exec/score/cpu/powerpc/cpu.c
+++ b/c/src/exec/score/cpu/powerpc/cpu.c
@@ -29,10 +29,10 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/context.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/wkspace.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/context.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/wkspace.h>
 
 /*
  *  These are for testing purposes.
diff --git a/c/src/exec/score/cpu/powerpc/cpu.h b/c/src/exec/score/cpu/powerpc/cpu.h
index fd44f5ee8e..7bccbce587 100644
--- a/c/src/exec/score/cpu/powerpc/cpu.h
+++ b/c/src/exec/score/cpu/powerpc/cpu.h
@@ -37,11 +37,11 @@
 extern "C" {
 #endif
 
-#include <rtems/core/ppc.h>               /* pick up machine definitions */
+#include <rtems/score/ppc.h>               /* pick up machine definitions */
 #ifndef ASM
 struct CPU_Interrupt_frame;
 
-#include <rtems/core/ppctypes.h>
+#include <rtems/score/ppctypes.h>
 #endif
 
 /* conditional compilation parameters */
diff --git a/c/src/exec/score/cpu/powerpc/ppc.h b/c/src/exec/score/cpu/powerpc/ppc.h
index 76f3129c2e..7e9d12875c 100644
--- a/c/src/exec/score/cpu/powerpc/ppc.h
+++ b/c/src/exec/score/cpu/powerpc/ppc.h
@@ -73,7 +73,7 @@ extern "C" {
  
 #if defined(ppc403)
  
-#define RTEMS_MODEL_NAME  "PowerPC 403"
+#define CPU_MODEL_NAME  "PowerPC 403"
 
 #define PPC_ALIGNMENT		4
 #define PPC_CACHE_ALIGNMENT	16
@@ -96,7 +96,7 @@ extern "C" {
 
 #elif defined(ppc601)
  
-#define RTEMS_MODEL_NAME  "PowerPC 601"
+#define CPU_MODEL_NAME  "PowerPC 601"
 
 #define PPC_ALIGNMENT		8
 #define PPC_CACHE_ALIGNMENT	32
@@ -119,7 +119,7 @@ extern "C" {
  
 #elif defined(ppc602)
  
-#define RTEMS_MODEL_NAME  "PowerPC 602"
+#define CPU_MODEL_NAME  "PowerPC 602"
 
 #define PPC_ALIGNMENT		4
 #define PPC_CACHE_ALIGNMENT	32
@@ -137,7 +137,7 @@ extern "C" {
 
 #elif defined(ppc603)
  
-#define RTEMS_MODEL_NAME  "PowerPC 603"
+#define CPU_MODEL_NAME  "PowerPC 603"
 
 #define PPC_ALIGNMENT		8
 #define PPC_CACHE_ALIGNMENT	32
@@ -160,7 +160,7 @@ extern "C" {
 
 #elif defined(ppc603e)
  
-#define RTEMS_MODEL_NAME  "PowerPC 603e"
+#define CPU_MODEL_NAME  "PowerPC 603e"
 
 #define PPC_ALIGNMENT		8
 #define PPC_CACHE_ALIGNMENT	32
@@ -183,7 +183,7 @@ extern "C" {
 
 #elif defined(ppc604)
  
-#define RTEMS_MODEL_NAME  "PowerPC 604"
+#define CPU_MODEL_NAME  "PowerPC 604"
 
 #define PPC_ALIGNMENT		8
 #define PPC_CACHE_ALIGNMENT	32