--- a/samples/main-adhoc-wifi.cc	Sat Mar 15 19:29:22 2008 +0100
+++ b/samples/main-adhoc-wifi.cc	Sat Mar 15 19:31:57 2008 +0100
@@ -173,8 +173,8 @@
 int main (int argc, char *argv[])
 {
   // disable fragmentation
-  Config::SetDefault ("WifiRemoteStationManager::FragmentationThreshold", String ("2200"));
-  Config::SetDefault ("WifiRemoteStationManager::RtsCtsThreshold", String ("2200"));
+  Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", String ("2200"));
+  Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", String ("2200"));
 
   CommandLine cmd;
   cmd.Parse (argc, argv);

--- a/samples/main-ap-wifi.cc	Sat Mar 15 19:29:22 2008 +0100
+++ b/samples/main-ap-wifi.cc	Sat Mar 15 19:31:57 2008 +0100
@@ -106,9 +106,9 @@
   Packet::EnableMetadata ();
 
   // enable rts cts all the time.
-  Config::SetDefault ("WifiRemoteStationManager::RtsCtsThreshold", String ("0"));
+  Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", String ("0"));
   // disable fragmentation
-  Config::SetDefault ("WifiRemoteStationManager::FragmentationThreshold", String ("2200"));
+  Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", String ("2200"));
 
   WifiHelper wifi;
   MobilityHelper mobility;

--- a/samples/main-random-walk.cc	Sat Mar 15 19:29:22 2008 +0100
+++ b/samples/main-random-walk.cc	Sat Mar 15 19:31:57 2008 +0100
@@ -28,10 +28,10 @@
 
 int main (int argc, char *argv[])
 {
-  Config::SetDefault ("RandomWalk2dMobilityModel::Mode", String ("Time"));
-  Config::SetDefault ("RandomWalk2dMobilityModel::Time", String ("2s"));
-  Config::SetDefault ("RandomWalk2dMobilityModel::Speed", String ("Constant:1.0"));
-  Config::SetDefault ("RandomWalk2dMobilityModel::Bounds", String ("0:200:0:100"));
+  Config::SetDefault ("ns3::RandomWalk2dMobilityModel::Mode", String ("Time"));
+  Config::SetDefault ("ns3::RandomWalk2dMobilityModel::Time", String ("2s"));
+  Config::SetDefault ("ns3::RandomWalk2dMobilityModel::Speed", String ("Constant:1.0"));
+  Config::SetDefault ("ns3::RandomWalk2dMobilityModel::Bounds", String ("0:200:0:100"));
 
   CommandLine cmd;
   cmd.Parse (argc, argv);
@@ -53,7 +53,7 @@
                              "Speed", String ("Constant:1.0"),
                              "Bounds", String ("0:200:0:100"));
   mobility.Layout (NodeList::Begin (), NodeList::End ());
-  Config::Connect ("/NodeList/*/$MobilityModelNotifier/CourseChange",
+  Config::Connect ("/NodeList/*/$ns3::MobilityModelNotifier/CourseChange",
                               MakeCallback (&CourseChange));
 
   Simulator::StopAt (Seconds (100.0));