diff --git a/src/mobility/constant-position-mobility-model.h b/src/mobility/constant-position-mobility-model.h
index b16f22290..31aa2e978 100644
--- a/src/mobility/constant-position-mobility-model.h
+++ b/src/mobility/constant-position-mobility-model.h
@@ -17,8 +17,8 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
-#ifndef STATIC_MOBILITY_MODEL_H
-#define STATIC_MOBILITY_MODEL_H
+#ifndef CONSTANT_POSITION_MOBILITY_MODEL_H
+#define CONSTANT_POSITION_MOBILITY_MODEL_H
 
 #include "mobility-model.h"
 #include "vector.h"
@@ -50,4 +50,4 @@ private:
 
 }; // namespace ns3
 
-#endif /* STATIC_MOBILITY_MODEL_H */
+#endif /* CONSTANT_POSITION_MOBILITY_MODEL_H */
diff --git a/src/mobility/static-speed-helper.cc b/src/mobility/constant-velocity-helper.cc
similarity index 75%
rename from src/mobility/static-speed-helper.cc
rename to src/mobility/constant-velocity-helper.cc
index 288f1b084..7ad84a4c9 100644
--- a/src/mobility/static-speed-helper.cc
+++ b/src/mobility/constant-velocity-helper.cc
@@ -19,25 +19,25 @@
  */
 #include "ns3/simulator.h"
 #include "ns3/rectangle.h"
-#include "static-speed-helper.h"
+#include "constant-velocity-helper.h"
 
 namespace ns3 {
 
-StaticSpeedHelper::StaticSpeedHelper ()
+ConstantVelocityHelper::ConstantVelocityHelper ()
   : m_paused (true)
 {}
-StaticSpeedHelper::StaticSpeedHelper (const Vector &position)
+ConstantVelocityHelper::ConstantVelocityHelper (const Vector &position)
   : m_position (position),
     m_paused (true)
 {}
-StaticSpeedHelper::StaticSpeedHelper (const Vector &position,
+ConstantVelocityHelper::ConstantVelocityHelper (const Vector &position,
 				      const Vector &vel)
   : m_position (position),
     m_velocity (vel),
     m_paused (true)
 {}
 void 
-StaticSpeedHelper::SetPosition (const Vector &position)
+ConstantVelocityHelper::SetPosition (const Vector &position)
 {
   m_position = position;
   m_velocity = Vector (0.0, 0.0, 0.0);
@@ -45,25 +45,25 @@ StaticSpeedHelper::SetPosition (const Vector &position)
 }
 
 Vector
-StaticSpeedHelper::GetCurrentPosition (void) const
+ConstantVelocityHelper::GetCurrentPosition (void) const
 {
   return m_position;
 }
 
 Vector 
-StaticSpeedHelper::GetVelocity (void) const
+ConstantVelocityHelper::GetVelocity (void) const
 {
   return m_paused? Vector (0.0, 0.0, 0.0) : m_velocity;
 }
 void 
-StaticSpeedHelper::SetVelocity (const Vector &vel)
+ConstantVelocityHelper::SetVelocity (const Vector &vel)
 {
   m_velocity = vel;
   m_lastUpdate = Simulator::Now ();
 }
 
 void
-StaticSpeedHelper::Update (void) const
+ConstantVelocityHelper::Update (void) const
 {
   Time now = Simulator::Now ();
   NS_ASSERT (m_lastUpdate <= now);
@@ -80,7 +80,7 @@ StaticSpeedHelper::Update (void) const
 }
 
 void
-StaticSpeedHelper::UpdateWithBounds (const Rectangle &bounds) const
+ConstantVelocityHelper::UpdateWithBounds (const Rectangle &bounds) const
 {
   Update ();
   m_position.x = std::min (bounds.xMax, m_position.x);
@@ -90,13 +90,13 @@ StaticSpeedHelper::UpdateWithBounds (const Rectangle &bounds) const
 }
 
 void 
-StaticSpeedHelper::Pause (void)
+ConstantVelocityHelper::Pause (void)
 {
   m_paused = true;
 }
 
 void 
-StaticSpeedHelper::Unpause (void)
+ConstantVelocityHelper::Unpause (void)
 {
   m_paused = false;
 }
diff --git a/src/mobility/static-speed-helper.h b/src/mobility/constant-velocity-helper.h
similarity index 83%
rename from src/mobility/static-speed-helper.h
rename to src/mobility/constant-velocity-helper.h
index e2c149231..3430381e6 100644
--- a/src/mobility/static-speed-helper.h
+++ b/src/mobility/constant-velocity-helper.h
@@ -17,8 +17,8 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
-#ifndef STATIC_SPEED_HELPER_H
-#define STATIC_SPEED_HELPER_H
+#ifndef CONSTANT_VELOCITY_HELPER_H
+#define CONSTANT_VELOCITY_HELPER_H
 
 #include "ns3/nstime.h"
 #include "vector.h"
@@ -27,12 +27,12 @@ namespace ns3 {
 
 class Rectangle;
 
-class StaticSpeedHelper
+class ConstantVelocityHelper
 {
  public:
-  StaticSpeedHelper ();
-  StaticSpeedHelper (const Vector &position);
-  StaticSpeedHelper (const Vector &position,
+  ConstantVelocityHelper ();
+  ConstantVelocityHelper (const Vector &position);
+  ConstantVelocityHelper (const Vector &position,
 		     const Vector &vel);
 
   void SetPosition (const Vector &position);
@@ -53,4 +53,4 @@ class StaticSpeedHelper
 
 } // namespace ns3
 
-#endif /* STATIC_SPEED_HELPER_H */
+#endif /* CONSTANT_VELOCITY_HELPER_H */
diff --git a/src/mobility/constant-velocity-mobility-model.h b/src/mobility/constant-velocity-mobility-model.h
index 5ce8bc4b8..6db3312ec 100644
--- a/src/mobility/constant-velocity-mobility-model.h
+++ b/src/mobility/constant-velocity-mobility-model.h
@@ -17,13 +17,13 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
-#ifndef STATIC_SPEED_MOBILITY_MODEL_H
-#define STATIC_SPEED_MOBILITY_MODEL_H
+#ifndef CONSTANT_VELOCITY_MOBILITY_MODEL_H
+#define CONSTANT_VELOCITY_MOBILITY_MODEL_H
 
 #include <stdint.h>
 #include "mobility-model.h"
 #include "ns3/nstime.h"
-#include "static-speed-helper.h"
+#include "constant-velocity-helper.h"
 
 namespace ns3 {
 
@@ -55,9 +55,9 @@ private:
   virtual void DoSetPosition (const Vector &position);
   virtual Vector DoGetVelocity (void) const;
   void Update (void) const;
-  StaticSpeedHelper m_helper;
+  ConstantVelocityHelper m_helper;
 };
 
 }; // namespace ns3
 
-#endif /* STATIC_SPEED_POSITION */
+#endif /* CONSTANT_VELOCITY_POSITION */
diff --git a/src/mobility/random-direction-2d-mobility-model.h b/src/mobility/random-direction-2d-mobility-model.h
index 68d6ab8b0..ecea0288f 100644
--- a/src/mobility/random-direction-2d-mobility-model.h
+++ b/src/mobility/random-direction-2d-mobility-model.h
@@ -27,7 +27,7 @@
 #include "ns3/rectangle.h"
 #include "ns3/random-variable.h"
 #include "mobility-model.h"
-#include "static-speed-helper.h"
+#include "constant-velocity-helper.h"
 
 namespace ns3 {
 
@@ -63,7 +63,7 @@ class RandomDirection2dMobilityModel : public MobilityModel
   RandomVariable m_speed;
   RandomVariable m_pause;
   EventId m_event;
-  StaticSpeedHelper m_helper;
+  ConstantVelocityHelper m_helper;
 };
 
 } // namespace ns3
diff --git a/src/mobility/random-walk-2d-mobility-model.h b/src/mobility/random-walk-2d-mobility-model.h
index 3b5755a55..504b2e82d 100644
--- a/src/mobility/random-walk-2d-mobility-model.h
+++ b/src/mobility/random-walk-2d-mobility-model.h
@@ -26,7 +26,7 @@
 #include "ns3/rectangle.h"
 #include "ns3/random-variable.h"
 #include "mobility-model.h"
-#include "static-speed-helper.h"
+#include "constant-velocity-helper.h"
 
 namespace ns3 {
 
@@ -63,7 +63,7 @@ class RandomWalk2dMobilityModel : public MobilityModel
   virtual void DoSetPosition (const Vector &position);
   virtual Vector DoGetVelocity (void) const;
 
-  StaticSpeedHelper m_helper;
+  ConstantVelocityHelper m_helper;
   EventId m_event;
   enum Mode m_mode;
   double m_modeDistance;
diff --git a/src/mobility/random-waypoint-mobility-model.h b/src/mobility/random-waypoint-mobility-model.h
index 74d46370a..d3386d5ec 100644
--- a/src/mobility/random-waypoint-mobility-model.h
+++ b/src/mobility/random-waypoint-mobility-model.h
@@ -20,7 +20,7 @@
 #ifndef RANDOM_WAYPOINT_MOBILITY_MODEL_H
 #define RANDOM_WAYPOINT_MOBILITY_MODEL_H
 
-#include "static-speed-helper.h"
+#include "constant-velocity-helper.h"
 #include "mobility-model.h"
 #include "position-allocator.h"
 #include "ns3/ptr.h"
@@ -53,7 +53,7 @@ private:
   virtual void DoSetPosition (const Vector &position);
   virtual Vector DoGetVelocity (void) const;
 
-  StaticSpeedHelper m_helper;
+  ConstantVelocityHelper m_helper;
   Ptr<PositionAllocator> m_position;
   RandomVariable m_speed;
   RandomVariable m_pause;
diff --git a/src/mobility/wscript b/src/mobility/wscript
index 30ce477a1..70307ece8 100644
--- a/src/mobility/wscript
+++ b/src/mobility/wscript
@@ -9,7 +9,7 @@ def build(bld):
         'position-allocator.cc',
         'rectangle.cc',
         'constant-position-mobility-model.cc',
-        'static-speed-helper.cc',
+        'constant-velocity-helper.cc',
         'constant-velocity-mobility-model.cc',
         'random-waypoint-mobility-model.cc',
         'random-walk-2d-mobility-model.cc',
@@ -25,7 +25,7 @@ def build(bld):
         'position-allocator.h',
         'rectangle.h',
         'constant-position-mobility-model.h',
-        'static-speed-helper.h',
+        'constant-velocity-helper.h',
         'constant-velocity-mobility-model.h',
         'random-waypoint-mobility-model.h',
         'random-walk-2d-mobility-model.h',