--- a/src/core/unix-system-wall-clock-ms.cc	Mon Sep 04 12:23:44 2006 +0200
+++ b/src/core/unix-system-wall-clock-ms.cc	Mon Sep 04 12:28:04 2006 +0200
@@ -19,12 +19,12 @@
  * Author: Mathieu Lacage <mathieu.lacage.inria.fr>
  */
 
-#include "wall-clock-ms.h"
+#include "system-wall-clock-ms.h"
 #include <sys/time.h>
 
 namespace ns3 {
 
-class WallClockMsPrivate {
+class SystemWallClockMsPrivate {
 public:
 	void start (void);
 	unsigned long long end (void);
@@ -34,14 +34,14 @@
 };
 
 void 
-WallClockMsPrivate::start (void)
+SystemWallClockMsPrivate::start (void)
 {
 	struct timezone tz;
 	gettimeofday (&m_start_tv, &tz);
 }
 
 unsigned long long 
-WallClockMsPrivate::end (void)
+SystemWallClockMsPrivate::end (void)
 {
 	struct timezone tz;
 	gettimeofday (&m_end_tv, &tz);
@@ -50,23 +50,23 @@
 	return end - start;
 }
 
-WallClockMs::WallClockMs ()
-	: m_priv (new WallClockMsPrivate ())
+SystemWallClockMs::SystemWallClockMs ()
+	: m_priv (new SystemWallClockMsPrivate ())
 {}
 
-WallClockMs::~WallClockMs ()
+SystemWallClockMs::~SystemWallClockMs ()
 {
 	delete m_priv;
 	m_priv = 0;
 }
 
 void
-WallClockMs::start (void)
+SystemWallClockMs::start (void)
 {
 	m_priv->start ();
 }
 unsigned long long
-WallClockMs::end (void)
+SystemWallClockMs::end (void)
 {
 	return m_priv->end ();
 }