--- a/src/mobility/model/random-walk-2d-mobility-model.cc	Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mobility/model/random-walk-2d-mobility-model.cc	Fri Apr 19 22:39:55 2013 +0200
@@ -75,14 +75,14 @@
 }
 
 void
-RandomWalk2dMobilityModel::DoStart (void)
+RandomWalk2dMobilityModel::DoInitialize (void)
 {
-  DoStartPrivate ();
-  MobilityModel::DoStart ();
+  DoInitializePrivate ();
+  MobilityModel::DoInitialize ();
 }
 
 void
-RandomWalk2dMobilityModel::DoStartPrivate (void)
+RandomWalk2dMobilityModel::DoInitializePrivate (void)
 {
   m_helper.Update ();
   double speed = m_speed->GetValue ();
@@ -116,7 +116,7 @@
   m_event.Cancel ();
   if (m_bounds.IsInside (nextPosition))
     {
-      m_event = Simulator::Schedule (delayLeft, &RandomWalk2dMobilityModel::DoStartPrivate, this);
+      m_event = Simulator::Schedule (delayLeft, &RandomWalk2dMobilityModel::DoInitializePrivate, this);
     }
   else
     {
@@ -168,7 +168,7 @@
   NS_ASSERT (m_bounds.IsInside (position));
   m_helper.SetPosition (position);
   Simulator::Remove (m_event);
-  m_event = Simulator::ScheduleNow (&RandomWalk2dMobilityModel::DoStartPrivate, this);
+  m_event = Simulator::ScheduleNow (&RandomWalk2dMobilityModel::DoInitializePrivate, this);
 }
 Vector
 RandomWalk2dMobilityModel::DoGetVelocity (void) const