5 files changed, 11 insertions, 11 deletions
diff --git a/cpukit/score/src/coretod.c b/cpukit/score/src/coretod.c
index 30efa76d79..1784a897a4 100644
--- a/cpukit/score/src/coretod.c
+++ b/cpukit/score/src/coretod.c
@@ -33,12 +33,12 @@
 void _TOD_Handler_initialization(void)
 {
   /* POSIX format TOD (timespec) */
-  _Timestamp_Set( &_TOD_Now, TOD_SECONDS_1970_THROUGH_1988, 0 );
+  _Timestamp_Set( &_TOD.now, TOD_SECONDS_1970_THROUGH_1988, 0 );
 
   /* Uptime (timespec) */
-  _Timestamp_Set_to_zero( &_TOD_Uptime );
+  _Timestamp_Set_to_zero( &_TOD.uptime );
 
   /* TOD has not been set */
-  _TOD_Is_set = false;
+  _TOD.is_set = false;
   _TOD_Activate();
 }
diff --git a/cpukit/score/src/coretodget.c b/cpukit/score/src/coretodget.c
index 3e73a8daab..94517e5926 100644
--- a/cpukit/score/src/coretodget.c
+++ b/cpukit/score/src/coretodget.c
@@ -31,9 +31,9 @@ void _TOD_Get_as_timestamp(
 
   /* assume time checked for NULL by caller */
 
-  /* _TOD_Now is the native current time */
+  /* _TOD.now is the native current time */
   _ISR_Disable( level );
-    now = _TOD_Now;
+    now = _TOD.now;
     nanoseconds = (*_Watchdog_Nanoseconds_since_tick_handler)();
   _ISR_Enable( level );
 
diff --git a/cpukit/score/src/coretodgetuptime.c b/cpukit/score/src/coretodgetuptime.c
index 454252921e..c3c05aed3c 100644
--- a/cpukit/score/src/coretodgetuptime.c
+++ b/cpukit/score/src/coretodgetuptime.c
@@ -42,9 +42,9 @@ void _TOD_Get_uptime(
 
   /* assume time checked for NULL by caller */
 
-  /* _TOD_Uptime is in native timestamp format */
+  /* _TOD.uptime is in native timestamp format */
   _ISR_Disable( level );
-    up = _TOD_Uptime;
+    up = _TOD.uptime;
     nanoseconds = (*_Watchdog_Nanoseconds_since_tick_handler)();
   _ISR_Enable( level );
 
diff --git a/cpukit/score/src/coretodset.c b/cpukit/score/src/coretodset.c
index e1b86a3976..9708ef9477 100644
--- a/cpukit/score/src/coretodset.c
+++ b/cpukit/score/src/coretodset.c
@@ -38,8 +38,8 @@ void _TOD_Set_with_timestamp(
   else
     _Watchdog_Adjust_seconds( WATCHDOG_FORWARD, seconds_next - seconds_now );
 
-  _TOD_Now = *tod;
-  _TOD_Is_set = true;
+  _TOD.now = *tod;
+  _TOD.is_set = true;
 
   _TOD_Activate();
   _Thread_Enable_dispatch();
diff --git a/cpukit/score/src/coretodtickle.c b/cpukit/score/src/coretodtickle.c
index 25ab6f3408..fbf67fda79 100644
--- a/cpukit/score/src/coretodtickle.c
+++ b/cpukit/score/src/coretodtickle.c
@@ -44,11 +44,11 @@ void _TOD_Tickle_ticks( void )
   _Watchdog_Ticks_since_boot += 1;
 
   /* Update the timespec format uptime */
-  _Timestamp_Add_to( &_TOD_Uptime, &tick );
+  _Timestamp_Add_to( &_TOD.uptime, &tick );
   /* we do not care how much the uptime changed */
 
   /* Update the timespec format TOD */
-  seconds = _Timestamp_Add_to_at_tick( &_TOD_Now, &tick );
+  seconds = _Timestamp_Add_to_at_tick( &_TOD.now, &tick );
   while ( seconds ) {
     _Watchdog_Tickle_seconds();
     seconds--;