diff --git a/src/mobility/random-waypoint-mobility-model.cc b/src/mobility/random-waypoint-mobility-model.cc
index 5188fff82..bff248676 100644
--- a/src/mobility/random-waypoint-mobility-model.cc
+++ b/src/mobility/random-waypoint-mobility-model.cc
@@ -45,7 +45,7 @@ RandomWaypointMobilityModel::GetTypeId (void)
                    RandomVariableValue (ConstantVariable (2.0)),
                    MakeRandomVariableAccessor (&RandomWaypointMobilityModel::m_pause),
                    MakeRandomVariableChecker ())
-    .AddAttribute ("Position",
+    .AddAttribute ("PositionAllocator",
                    "The position model used to pick a destination point.",
                    PointerValue (),
                    MakePointerAccessor (&RandomWaypointMobilityModel::m_position),
diff --git a/utils/python-unit-tests.py b/utils/python-unit-tests.py
index 00713e8d9..a08f668fe 100644
--- a/utils/python-unit-tests.py
+++ b/utils/python-unit-tests.py
@@ -97,14 +97,14 @@ class TestSimulator(unittest.TestCase):
         ## -- object pointer values
         mobility = ns3.RandomWaypointMobilityModel()
         ptr = ns3.PointerValue()
-        mobility.GetAttribute("Position", ptr)
+        mobility.GetAttribute("PositionAllocator", ptr)
         self.assertEqual(ptr.GetObject(), None)
         
         pos = ns3.ListPositionAllocator()
-        mobility.SetAttribute("Position", ns3.PointerValue(pos))
+        mobility.SetAttribute("PositionAllocator", ns3.PointerValue(pos))
 
         ptr = ns3.PointerValue()
-        mobility.GetAttribute("Position", ptr)
+        mobility.GetAttribute("PositionAllocator", ptr)
         self.assert_(ptr.GetObject() is not None)
 
     def testIdentity(self):