diff --git a/cpukit/score/cpu/nios2/ChangeLog b/cpukit/score/cpu/nios2/ChangeLog
index bcba632ca5..33deb926fe 100644
--- a/cpukit/score/cpu/nios2/ChangeLog
+++ b/cpukit/score/cpu/nios2/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-02	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/nios2-utility.h, nios2-isr-set-level.c,
+	nios2-isr-get-level.c: Renamed functions.
+
 2011-09-02	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* rtems/score/nios2-utility.h: Use the same values for defines used by
diff --git a/cpukit/score/cpu/nios2/nios2-isr-get-level.c b/cpukit/score/cpu/nios2/nios2-isr-get-level.c
index ea16f20b9f..147a48b9c9 100644
--- a/cpukit/score/cpu/nios2/nios2-isr-get-level.c
+++ b/cpukit/score/cpu/nios2/nios2-isr-get-level.c
@@ -26,7 +26,7 @@ uint32_t _CPU_ISR_Get_level( void )
   uint32_t status = _Nios2_Get_ctlreg_status();
   uint32_t level = 0;
 
-  switch ( _Nios2_Get_ISR_status_mask() ) {
+  switch ( _Nios2_ISR_Get_status_mask() ) {
     case NIOS2_ISR_STATUS_MASK_IIC:
       level = (status & NIOS2_STATUS_PIE) == 0;
       break;
diff --git a/cpukit/score/cpu/nios2/nios2-isr-set-level.c b/cpukit/score/cpu/nios2/nios2-isr-set-level.c
index 2ae92c3ae3..b94a9345e9 100644
--- a/cpukit/score/cpu/nios2/nios2-isr-set-level.c
+++ b/cpukit/score/cpu/nios2/nios2-isr-set-level.c
@@ -23,7 +23,7 @@
 
 uint32_t _Nios2_ISR_Set_level( uint32_t new_level, uint32_t status )
 {
-  switch ( _Nios2_Get_ISR_status_mask() ) {
+  switch ( _Nios2_ISR_Get_status_mask() ) {
     case NIOS2_ISR_STATUS_MASK_IIC:
       if ( new_level == 0 ) {
         status |= NIOS2_STATUS_PIE;
diff --git a/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h b/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h
index d49d90377d..9a990290df 100644
--- a/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h
+++ b/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h
@@ -286,19 +286,19 @@ static inline void _Nios2_Set_ctlreg_mpuacc( uint32_t value )
   __builtin_wrctl( NIOS2_CTLREG_INDEX_MPUACC, (int) value );
 }
 
-static inline uint32_t _Nios2_Get_ISR_status_mask( void )
+static inline uint32_t _Nios2_ISR_Get_status_mask( void )
 {
   return (uint32_t) &_Nios2_ISR_Status_mask [0];
 }
 
-static inline uint32_t _Nios2_Get_ISR_status_bits( void )
+static inline uint32_t _Nios2_ISR_Get_status_bits( void )
 {
   return (uint32_t) &_Nios2_ISR_Status_bits [0];
 }
 
 static inline bool _Nios2_Has_internal_interrupt_controller( void )
 {
-  return _Nios2_Get_ISR_status_mask() == NIOS2_ISR_STATUS_MASK_IIC;
+  return _Nios2_ISR_Get_status_mask() == NIOS2_ISR_STATUS_MASK_IIC;
 }
 
 uint32_t _Nios2_ISR_Set_level( uint32_t new_level, uint32_t status );