--- a/src/wifi/model/wifi-phy.h	Sat Jul 11 00:59:27 2015 +0200
+++ b/src/wifi/model/wifi-phy.h	Sat Jul 11 11:14:24 2015 +0200
@@ -38,10 +38,10 @@
 class WifiChannel;
 class NetDevice;
 
-struct snrDb
+struct signalNoiseDbm
 {
-  double signal;
-  double noise;
+  double signal; //in dBm
+  double noise; //in dBm
 };
 
 struct mpduInfo
@@ -1014,11 +1014,11 @@
    * \param txVector the txvector that holds rx parameters
    * \param aMpdu the type of the packet (0 is not A-MPDU, 1 is a MPDU that is part of an A-MPDU and 2 is the last MPDU in an A-MPDU)
    *        and the A-MPDU reference number (must be a different value for each A-MPDU but the same for each subframe within one A-MPDU)
-   * \param snr signal power and noise power in dB
+   * \param signalNoise signal power and noise power in dBm
    */
   void NotifyMonitorSniffRx (Ptr<const Packet> packet, uint16_t channelFreqMhz,
                              uint16_t channelNumber, uint32_t rate, WifiPreamble preamble,
-                             WifiTxVector txvector, struct mpduInfo aMpdu, struct snrDb snr);
+                             WifiTxVector txvector, struct mpduInfo aMpdu, struct signalNoiseDbm signalNoise);
 
   /**
    * TracedCallback signature for monitor mode receive events.
@@ -1039,11 +1039,11 @@
    * \param txVector the txvector that holds rx parameters
    * \param aMpdu the type of the packet (0 is not A-MPDU, 1 is a MPDU that is part of an A-MPDU and 2 is the last MPDU in an A-MPDU)
    *        and the A-MPDU reference number (must be a different value for each A-MPDU but the same for each subframe within one A-MPDU)
-   * \param snr signal power and noise power in dB
+   * \param signalNoise signal power and noise power in dBm
    */
   typedef void (* MonitorSnifferRxCallback)(Ptr<const Packet> packet, uint16_t channelFreqMhz,
                                             uint16_t channelNumber, uint32_t rate, WifiPreamble preamble,
-                                            WifiTxVector txvector, struct mpduInfo aMpdu, struct snrDb snr);
+                                            WifiTxVector txvector, struct mpduInfo aMpdu, struct signalNoiseDbm signalNoise);
 
   /**
    * Public method used to fire a MonitorSniffer trace for a wifi packet being transmitted.
@@ -1216,7 +1216,7 @@
    *
    * \see class CallBackTraceSource
    */
-  TracedCallback<Ptr<const Packet>, uint16_t, uint16_t, uint32_t, WifiPreamble, WifiTxVector, struct mpduInfo, struct snrDb> m_phyMonitorSniffRxTrace;
+  TracedCallback<Ptr<const Packet>, uint16_t, uint16_t, uint32_t, WifiPreamble, WifiTxVector, struct mpduInfo, struct signalNoiseDbm> m_phyMonitorSniffRxTrace;
 
   /**
    * A trace source that emulates a wifi device in monitor mode