--- a/src/lte/doc/source/lte-user.rst	Thu Nov 17 13:12:15 2011 +0100
+++ b/src/lte/doc/source/lte-user.rst	Thu Nov 17 17:45:16 2011 +0100
@@ -161,7 +161,7 @@
 specifying the new default values that you want to use for some attributes::
 
    default ns3::LenaHelper::Scheduler "ns3::PfFfMacScheduler"
-   default ns3::LenaHelper::PropagationModel "ns3::FriisSpectrumPropagationLossModel"
+   default ns3::LenaHelper::PathlossModel "ns3::FriisSpectrumPropagationLossModel"
    default ns3::LteEnbNetDevice::UlBandwidth "25"
    default ns3::LteEnbNetDevice::DlBandwidth "25"
    default ns3::LteEnbNetDevice::DlEarfcn "100"
@@ -352,11 +352,11 @@
     #include <ns3/buildings-propagation-loss-model.h>
     #include <ns3/building.h>
 
-#. Propagation model selection::
+#. Pathloss model selection::
 
     Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
   
-    lena->SetAttribute ("PropagationModel", StringValue ("ns3::BuildingsPropagationLossModel"));
+    lena->SetAttribute ("PathlossModel", StringValue ("ns3::BuildingsPropagationLossModel"));
 
 #. EUTRA Band Selection
    

--- a/src/lte/examples/inter-cell-interference.cc	Thu Nov 17 13:12:15 2011 +0100
+++ b/src/lte/examples/inter-cell-interference.cc	Thu Nov 17 17:45:16 2011 +0100
@@ -65,7 +65,7 @@
 
   Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
   
-  lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
+  lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
 
   // Create Nodes: eNodeB and UE
   NodeContainer enbNodes;

--- a/src/lte/examples/lena-cqi-threshold.cc	Thu Nov 17 13:12:15 2011 +0100
+++ b/src/lte/examples/lena-cqi-threshold.cc	Thu Nov 17 17:45:16 2011 +0100
@@ -78,7 +78,7 @@
   cmd.Parse (argc, argv);
 
   Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
-  lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
+  lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
   //lena->EnableLogComponents ();
 
   //   LogComponentEnable ("LtePhy", LOG_LEVEL_ALL);

--- a/src/lte/examples/lena-extract-pathloss.cc	Thu Nov 17 13:12:15 2011 +0100
+++ b/src/lte/examples/lena-extract-pathloss.cc	Thu Nov 17 17:45:16 2011 +0100
@@ -177,7 +177,7 @@
   // but it WON'T work if you ONLY use SpectrumPropagationLossModels such as:
   // ns3::FriisSpectrumPropagationLossModel
   // ns3::ConstantSpectrumPropagationLossModel
-  lena->SetAttribute ("PropagationModel", StringValue ("ns3::Cost231PropagationLossModel"));
+  lena->SetAttribute ("PathlossModel", StringValue ("ns3::Cost231PropagationLossModel"));
   
 
   // Create Nodes: eNodeB and UE

--- a/src/lte/examples/lena-rlc-calculator.cc	Thu Nov 17 13:12:15 2011 +0100
+++ b/src/lte/examples/lena-rlc-calculator.cc	Thu Nov 17 17:45:16 2011 +0100
@@ -43,7 +43,7 @@
 
   Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
 
-  lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
+  lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
   // Enable LTE log components
   //lena->EnableLogComponents ();
 

--- a/src/lte/examples/lena-runtime-profiler.cc	Thu Nov 17 13:12:15 2011 +0100
+++ b/src/lte/examples/lena-runtime-profiler.cc	Thu Nov 17 17:45:16 2011 +0100
@@ -72,13 +72,13 @@
   //LogComponentEnable ("BuildingsPropagationLossModel", LOG_LEVEL_ALL);
   if (nFloors == 0)
     {
-      lena->SetAttribute("PropagationModel",
+      lena->SetAttribute("PathlossModel",
           StringValue("ns3::FriisPropagationLossModel"));
       nEnb = nEnbPerFloor;
     }
   else
     {
-      lena->SetAttribute("PropagationModel",
+      lena->SetAttribute("PathlossModel",
           StringValue("ns3::BuildingsPropagationLossModel"));
       nEnb = nFloors * nEnbPerFloor;
     }

--- a/src/lte/helper/lena-helper.cc	Thu Nov 17 13:12:15 2011 +0100
+++ b/src/lte/helper/lena-helper.cc	Thu Nov 17 17:45:16 2011 +0100
@@ -144,8 +144,8 @@
                    StringValue ("ns3::PfFfMacScheduler"),
                    MakeStringAccessor (&LenaHelper::SetSchedulerType),
                    MakeStringChecker ())
-    .AddAttribute ("PropagationModel",
-                   "The type of propagation model to be used",
+    .AddAttribute ("PathlossModel",
+                   "The type of pathloss model to be used",
                    StringValue ("ns3::BuildingsPropagationLossModel"),
                    MakeStringAccessor (&LenaHelper::SetPropagationModelType),
                    MakeStringChecker ())
@@ -185,7 +185,7 @@
 }
 
 void 
-LenaHelper::SetPropagationModelAttribute (std::string n, const AttributeValue &v)
+LenaHelper::SetPathlossModelAttribute (std::string n, const AttributeValue &v)
 {
   NS_LOG_FUNCTION (this << n);
   m_dlPropagationModelFactory.Set (n, v);

--- a/src/lte/helper/lena-helper.h	Thu Nov 17 13:12:15 2011 +0100
+++ b/src/lte/helper/lena-helper.h	Thu Nov 17 17:45:16 2011 +0100
@@ -145,7 +145,7 @@
   /**
    * set an attribute for the propagation model to be created
    */
-  void SetPropagationModelAttribute (std::string n, const AttributeValue &v);
+  void SetPathlossModelAttribute (std::string n, const AttributeValue &v);
   
   /** 
    * 

--- a/src/lte/test/lte-test-fading.cc	Thu Nov 17 13:12:15 2011 +0100
+++ b/src/lte/test/lte-test-fading.cc	Thu Nov 17 17:45:16 2011 +0100
@@ -85,7 +85,7 @@
   
   Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
   
-  lena->SetAttribute ("PropagationModel", StringValue ("ns3::BuildingsPropagationLossModel"));
+  lena->SetAttribute ("PathlossModel", StringValue ("ns3::BuildingsPropagationLossModel"));
   
   // Create Nodes: eNodeB, home eNB, UE and home UE (UE attached to HeNB)
   NodeContainer enbNodes;

--- a/src/lte/test/lte-test-interference.cc	Thu Nov 17 13:12:15 2011 +0100
+++ b/src/lte/test/lte-test-interference.cc	Thu Nov 17 17:45:16 2011 +0100
@@ -116,7 +116,7 @@
   //   lena->EnableLogComponents ();
   lena->EnableMacTraces ();
   lena->EnableRlcTraces ();
-  lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
+  lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
 
   // Create Nodes: eNodeB and UE
   NodeContainer enbNodes;

--- a/src/lte/test/lte-test-link-adaptation.cc	Thu Nov 17 13:12:15 2011 +0100
+++ b/src/lte/test/lte-test-link-adaptation.cc	Thu Nov 17 17:45:16 2011 +0100
@@ -162,9 +162,9 @@
 //   lena->EnableLogComponents ();
   lena->EnableMacTraces ();
   lena->EnableRlcTraces ();
-  lena->SetAttribute ("PropagationModel", StringValue ("ns3::ConstantSpectrumPropagationLossModel"));
+  lena->SetAttribute ("PathlossModel", StringValue ("ns3::ConstantSpectrumPropagationLossModel"));
   NS_LOG_INFO ("SNR = " << m_snrDb << "  LOSS = " << m_loss);
-  lena->SetPropagationModelAttribute ("Loss", DoubleValue (m_loss));
+  lena->SetPathlossModelAttribute ("Loss", DoubleValue (m_loss));
 
   // Create Nodes: eNodeB and UE
   NodeContainer enbNodes;

--- a/src/lte/test/lte-test-pathloss-model.cc	Thu Nov 17 13:12:15 2011 +0100
+++ b/src/lte/test/lte-test-pathloss-model.cc	Thu Nov 17 17:45:16 2011 +0100
@@ -208,16 +208,16 @@
   //   lena->EnableLogComponents ();
   lena->EnableMacTraces ();
   lena->EnableRlcTraces ();
-  lena->SetAttribute ("PropagationModel", StringValue ("ns3::BuildingsPropagationLossModel"));
+  lena->SetAttribute ("PathlossModel", StringValue ("ns3::BuildingsPropagationLossModel"));
 
   // set frequency. This is important because it changes the behavior of the pathloss model
   lena->SetEnbDeviceAttribute ("DlEarfcn", UintegerValue (200));
 
   
   // remove shadowing component
-  lena->SetPropagationModelAttribute ("ShadowSigmaOutdoor", DoubleValue (0.0));
-  lena->SetPropagationModelAttribute ("ShadowSigmaIndoor", DoubleValue (0.0));
-  lena->SetPropagationModelAttribute ("ShadowSigmaExtWalls", DoubleValue (0.0));
+  lena->SetPathlossModelAttribute ("ShadowSigmaOutdoor", DoubleValue (0.0));
+  lena->SetPathlossModelAttribute ("ShadowSigmaIndoor", DoubleValue (0.0));
+  lena->SetPathlossModelAttribute ("ShadowSigmaExtWalls", DoubleValue (0.0));
   
   // Create Nodes: eNodeB and UE
   NodeContainer enbNodes;

--- a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc	Thu Nov 17 13:12:15 2011 +0100
+++ b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc	Thu Nov 17 17:45:16 2011 +0100
@@ -241,7 +241,7 @@
 
   Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
   
-  lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
+  lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
 
   // Create Nodes: eNodeB and UE
   NodeContainer enbNodes;
@@ -422,7 +422,7 @@
 
   Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
   
-  lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
+  lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
 
   // Create Nodes: eNodeB and UE
   NodeContainer enbNodes;

--- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc	Thu Nov 17 13:12:15 2011 +0100
+++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc	Thu Nov 17 17:45:16 2011 +0100
@@ -229,7 +229,7 @@
 
   Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
   
-  lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
+  lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
 
   // Create Nodes: eNodeB and UE
   NodeContainer enbNodes;