--- a/src/wifi/helper/athstats-helper.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/helper/athstats-helper.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -111,6 +111,7 @@
 {
   static TypeId tid = TypeId ("ns3::AthstatsWifiTraceSink")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AthstatsWifiTraceSink> ()
     .AddAttribute ("Interval",
                    "Time interval between reports",

--- a/src/wifi/model/aarf-wifi-manager.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/aarf-wifi-manager.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -59,6 +59,7 @@
 {
   static TypeId tid = TypeId ("ns3::AarfWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AarfWifiManager> ()
     .AddAttribute ("SuccessK", "Multiplication factor for the success threshold in the AARF algorithm.",
                    DoubleValue (2.0),

--- a/src/wifi/model/aarfcd-wifi-manager.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/aarfcd-wifi-manager.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -66,6 +66,7 @@
 {
   static TypeId tid = TypeId ("ns3::AarfcdWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AarfcdWifiManager> ()
     .AddAttribute ("SuccessK", "Multiplication factor for the success threshold in the AARF algorithm.",
                    DoubleValue (2.0),

--- a/src/wifi/model/adhoc-wifi-mac.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/adhoc-wifi-mac.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -47,6 +47,7 @@
 {
   static TypeId tid = TypeId ("ns3::AdhocWifiMac")
     .SetParent<RegularWifiMac> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AdhocWifiMac> ()
   ;
   return tid;

--- a/src/wifi/model/ampdu-subframe-header.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/ampdu-subframe-header.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -29,6 +29,7 @@
 {
   static TypeId tid = TypeId ("ns3::AmpduSubframeHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AmpduSubframeHeader> ()
   ;
   return tid;

--- a/src/wifi/model/ampdu-tag.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/ampdu-tag.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -30,6 +30,7 @@
 {
   static TypeId tid = TypeId ("ns3::AmpduTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AmpduTag> ()
     .AddAttribute ("Ampdu Exists", "The value that indicates that the packet contains an AMPDU",
                    UintegerValue (false),

--- a/src/wifi/model/amrr-wifi-manager.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/amrr-wifi-manager.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -57,6 +57,7 @@
 {
   static TypeId tid = TypeId ("ns3::AmrrWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AmrrWifiManager> ()
     .AddAttribute ("UpdatePeriod",
                    "The interval between decisions about rate control changes",

--- a/src/wifi/model/amsdu-subframe-header.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/amsdu-subframe-header.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -32,6 +32,7 @@
 {
   static TypeId tid = TypeId ("ns3::AmsduSubframeHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AmsduSubframeHeader> ()
   ;
   return tid;

--- a/src/wifi/model/ap-wifi-mac.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/ap-wifi-mac.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -49,6 +49,7 @@
 {
   static TypeId tid = TypeId ("ns3::ApWifiMac")
     .SetParent<RegularWifiMac> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<ApWifiMac> ()
     .AddAttribute ("BeaconInterval", "Delay between two beacons",
                    TimeValue (MicroSeconds (102400)),

--- a/src/wifi/model/aparf-wifi-manager.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/aparf-wifi-manager.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -61,6 +61,7 @@
 {
   static TypeId tid = TypeId ("ns3::AparfWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AparfWifiManager> ()
     .AddAttribute ("SuccessThreshold 1",
                    "The minimum number of successful transmissions in \"High\" state to try a new power or rate.",

--- a/src/wifi/model/arf-wifi-manager.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/arf-wifi-manager.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -56,6 +56,7 @@
 {
   static TypeId tid = TypeId ("ns3::ArfWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<ArfWifiManager> ()
     .AddAttribute ("TimerThreshold", "The 'timer' threshold in the ARF algorithm.",
                    UintegerValue (15),

--- a/src/wifi/model/cara-wifi-manager.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/cara-wifi-manager.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -52,6 +52,7 @@
 {
   static TypeId tid = TypeId ("ns3::CaraWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<CaraWifiManager> ()
     .AddAttribute ("ProbeThreshold",
                    "The number of consecutive transmissions failure to activate the RTS probe.",

--- a/src/wifi/model/constant-rate-wifi-manager.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/constant-rate-wifi-manager.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::ConstantRateWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<ConstantRateWifiManager> ()
     .AddAttribute ("DataMode", "The transmission mode to use for every data packet transmission",
                    StringValue ("OfdmRate6Mbps"),

--- a/src/wifi/model/ctrl-headers.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/ctrl-headers.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -51,6 +51,7 @@
   NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::CtrlBAckRequestHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<CtrlBAckRequestHeader> ()
   ;
   return tid;
@@ -299,6 +300,7 @@
 {
   static TypeId tid = TypeId ("ns3::CtrlBAckResponseHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<CtrlBAckResponseHeader> ()
   ;
   return tid;

--- a/src/wifi/model/dca-txop.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/dca-txop.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -135,6 +135,7 @@
 {
   static TypeId tid = TypeId ("ns3::DcaTxop")
     .SetParent (ns3::Dcf::GetTypeId ())
+    .SetGroupName ("Wifi")
     .AddConstructor<DcaTxop> ()
     .AddAttribute ("Queue", "The WifiMacQueue object",
                    PointerValue (),

--- a/src/wifi/model/edca-txop-n.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/edca-txop-n.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -201,6 +201,7 @@
 {
   static TypeId tid = TypeId ("ns3::EdcaTxopN")
     .SetParent (ns3::Dcf::GetTypeId ())
+    .SetGroupName ("Wifi")
     .AddConstructor<EdcaTxopN> ()
     .AddAttribute ("BlockAckThreshold", "If number of packets in this queue reaches this value,\
                                          block ack mechanism is used. If this value is 0, block ack is never used.",

--- a/src/wifi/model/error-rate-model.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/error-rate-model.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -27,6 +27,7 @@
 {
   static TypeId tid = TypeId ("ns3::ErrorRateModel")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
   ;
   return tid;
 }

--- a/src/wifi/model/ideal-wifi-manager.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/ideal-wifi-manager.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -45,6 +45,7 @@
 {
   static TypeId tid = TypeId ("ns3::IdealWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<IdealWifiManager> ()
     .AddAttribute ("BerThreshold",
                    "The maximum Bit Error Rate acceptable at any transmission mode",

--- a/src/wifi/model/mgt-headers.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/mgt-headers.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -81,6 +81,7 @@
 {
   static TypeId tid = TypeId ("ns3::MgtProbeRequestHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MgtProbeRequestHeader> ()
   ;
   return tid;
@@ -181,6 +182,7 @@
 {
   static TypeId tid = TypeId ("ns3::MgtProbeResponseHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MgtProbeResponseHeader> ()
   ;
   return tid;
@@ -311,6 +313,7 @@
 {
   static TypeId tid = TypeId ("ns3::MgtAssocRequestHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MgtAssocRequestHeader> ()
   ;
   return tid;
@@ -413,6 +416,7 @@
 {
   static TypeId tid = TypeId ("ns3::MgtAssocResponseHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MgtAssocResponseHeader> ()
   ;
   return tid;
@@ -601,6 +605,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiActionHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<WifiActionHeader> ();
   return tid;
 }
@@ -651,6 +656,7 @@
 {
   static TypeId tid = TypeId ("ns3::MgtAddBaRequestHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MgtAddBaRequestHeader> ();
   return tid;
 }
@@ -827,6 +833,7 @@
 {
   static TypeId tid = TypeId ("ns3::MgtAddBaResponseHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MgtAddBaResponseHeader> ()
   ;
   return tid;
@@ -991,6 +998,7 @@
 {
   static TypeId tid = TypeId ("ns3::MgtDelBaHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MgtDelBaHeader> ()
   ;
   return tid;

--- a/src/wifi/model/minstrel-wifi-manager.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/minstrel-wifi-manager.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -91,6 +91,7 @@
 {
   static TypeId tid = TypeId ("ns3::MinstrelWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MinstrelWifiManager> ()
     .AddAttribute ("UpdateStatistics",
                    "The interval between updating statistics table ",

--- a/src/wifi/model/mpdu-aggregator.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/mpdu-aggregator.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -32,6 +32,7 @@
 MpduAggregator::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::MpduAggregator")
+    .SetGroupName ("Wifi")
     .SetParent<Object> ()
   ;
   return tid;

--- a/src/wifi/model/mpdu-standard-aggregator.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/mpdu-standard-aggregator.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::MpduStandardAggregator")
     .SetParent<MpduAggregator> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MpduStandardAggregator> ()
     .AddAttribute ("MaxAmpduSize", "Max length in bytes of an A-MPDU",
                    UintegerValue (65535),

--- a/src/wifi/model/msdu-aggregator.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/msdu-aggregator.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -33,6 +33,7 @@
 {
   static TypeId tid = TypeId ("ns3::MsduAggregator")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
   ;
   return tid;
 }

--- a/src/wifi/model/msdu-standard-aggregator.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/msdu-standard-aggregator.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::MsduStandardAggregator")
     .SetParent<MsduAggregator> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MsduStandardAggregator> ()
     .AddAttribute ("MaxAmsduSize", "Max length in byte of an A-MSDU",
                    UintegerValue (7935),

--- a/src/wifi/model/nist-error-rate-model.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/nist-error-rate-model.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::NistErrorRateModel")
     .SetParent<ErrorRateModel> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<NistErrorRateModel> ()
   ;
   return tid;

--- a/src/wifi/model/onoe-wifi-manager.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/onoe-wifi-manager.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -55,6 +55,7 @@
 {
   static TypeId tid = TypeId ("ns3::OnoeWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<OnoeWifiManager> ()
     .AddAttribute ("UpdatePeriod",
                    "The interval between decisions about rate control changes",

--- a/src/wifi/model/parf-wifi-manager.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/parf-wifi-manager.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -62,6 +62,7 @@
 {
   static TypeId tid = TypeId ("ns3::ParfWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<ParfWifiManager> ()
     .AddAttribute ("AttemptThreshold",
                    "The minimum number of transmission attempts to try a new power or rate.",

--- a/src/wifi/model/qos-tag.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/qos-tag.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -30,6 +30,7 @@
 {
   static TypeId tid = TypeId ("ns3::QosTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<QosTag> ()
     .AddAttribute ("tid", "The tid that indicates AC which packet belongs",
                    UintegerValue (0),

--- a/src/wifi/model/regular-wifi-mac.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/regular-wifi-mac.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -651,6 +651,7 @@
 {
   static TypeId tid = TypeId ("ns3::RegularWifiMac")
     .SetParent<WifiMac> ()
+    .SetGroupName ("Wifi")
     .AddAttribute ("QosSupported",
                    "This Boolean attribute is set to enable 802.11e/WMM-style QoS support at this STA",
                    BooleanValue (false),

--- a/src/wifi/model/rraa-wifi-manager.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/rraa-wifi-manager.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -59,6 +59,7 @@
 {
   static TypeId tid = TypeId ("ns3::RraaWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<RraaWifiManager> ()
     .AddAttribute ("Basic",
                    "If true the RRAA-BASIC algorithm will be used, otherwise the RRAA wil be used",

--- a/src/wifi/model/snr-tag.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/snr-tag.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::SnrTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<SnrTag> ()
     .AddAttribute ("Snr", "The snr of the last packet received",
                    DoubleValue (0.0),

--- a/src/wifi/model/sta-wifi-mac.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/sta-wifi-mac.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -66,6 +66,7 @@
 {
   static TypeId tid = TypeId ("ns3::StaWifiMac")
     .SetParent<RegularWifiMac> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<StaWifiMac> ()
     .AddAttribute ("ProbeRequestTimeout", "The interval between two consecutive probe request attempts.",
                    TimeValue (Seconds (0.05)),

--- a/src/wifi/model/wifi-channel.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/wifi-channel.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -42,6 +42,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiChannel")
     .SetParent<Channel> ()
+    .SetGroupName ("Wifi")
   ;
   return tid;
 }

--- a/src/wifi/model/wifi-information-element-vector.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/wifi-information-element-vector.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -43,6 +43,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiInformationElementVector")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<WifiInformationElementVector> ();
   return tid;
 }

--- a/src/wifi/model/wifi-mac-header.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/wifi-mac-header.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -956,6 +956,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiMacHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<WifiMacHeader> ()
   ;
   return tid;

--- a/src/wifi/model/wifi-mac-queue.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/wifi-mac-queue.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -45,6 +45,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiMacQueue")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<WifiMacQueue> ()
     .AddAttribute ("MaxPacketNumber", "If a packet arrives when there are already this number of packets, it is dropped.",
                    UintegerValue (400),

--- a/src/wifi/model/wifi-mac-trailer.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/wifi-mac-trailer.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiMacTrailer")
     .SetParent<Trailer> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<WifiMacTrailer> ()
   ;
   return tid;

--- a/src/wifi/model/wifi-mac.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/wifi-mac.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -139,6 +139,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiMac")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
     .AddAttribute ("CtsTimeout", "When this timeout expires, the RTS/CTS handshake has failed.",
                    TimeValue (GetDefaultCtsAckTimeout ()),
                    MakeTimeAccessor (&WifiMac::SetCtsTimeout,

--- a/src/wifi/model/wifi-net-device.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/wifi-net-device.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -42,6 +42,7 @@
   static TypeId tid = TypeId ("ns3::WifiNetDevice")
     .SetParent<NetDevice> ()
     .AddConstructor<WifiNetDevice> ()
+    .SetGroupName ("Wifi")
     .AddAttribute ("Mtu", "The MAC-level Maximum Transmission Unit",
                    UintegerValue (MAX_MSDU_SIZE - LLC_SNAP_HEADER_LENGTH),
                    MakeUintegerAccessor (&WifiNetDevice::SetMtu,

--- a/src/wifi/model/wifi-phy-state-helper.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/wifi-phy-state-helper.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiPhyStateHelper")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<WifiPhyStateHelper> ()
     .AddTraceSource ("State",
                      "The state of the PHY layer",

--- a/src/wifi/model/wifi-phy.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/wifi-phy.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -55,6 +55,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiPhy")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
     .AddTraceSource ("PhyTxBegin",
                      "Trace source indicating a packet "
                      "has begun transmitting over the channel medium",

--- a/src/wifi/model/wifi-remote-station-manager.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/wifi-remote-station-manager.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -79,6 +79,7 @@
 {
   static TypeId tid = TypeId ("ns3::HighLatencyDataTxVectorTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<HighLatencyDataTxVectorTag> ()  
     ;
   return tid;
@@ -148,6 +149,7 @@
 {
   static TypeId tid = TypeId ("ns3::HighLatencyRtsTxVectorTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<HighLatencyRtsTxVectorTag> ()  
     ;
   return tid;
@@ -216,6 +218,7 @@
 {
   static TypeId tid = TypeId ("ns3::HighLatencyCtsToSelfTxVectorTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<HighLatencyCtsToSelfTxVectorTag> ()  
     ;
   return tid;
@@ -257,6 +260,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiRemoteStationManager")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
     .AddAttribute ("IsLowLatency", "If true, we attempt to modelize a so-called low-latency device: a device"
                    " where decisions about tx parameters can be made on a per-packet basis and feedback about the"
                    " transmission of each packet is obtained before sending the next. Otherwise, we modelize a "

--- a/src/wifi/model/yans-error-rate-model.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/yans-error-rate-model.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -36,6 +36,7 @@
 {
   static TypeId tid = TypeId ("ns3::YansErrorRateModel")
     .SetParent<ErrorRateModel> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<YansErrorRateModel> ()
   ;
   return tid;

--- a/src/wifi/model/yans-wifi-channel.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/yans-wifi-channel.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -41,6 +41,7 @@
 {
   static TypeId tid = TypeId ("ns3::YansWifiChannel")
     .SetParent<WifiChannel> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<YansWifiChannel> ()
     .AddAttribute ("PropagationLossModel", "A pointer to the propagation loss model attached to this channel.",
                    PointerValue (),

--- a/src/wifi/model/yans-wifi-phy.cc	Fri Mar 27 10:03:43 2015 -0700
+++ b/src/wifi/model/yans-wifi-phy.cc	Fri Mar 27 11:28:59 2015 -0700
@@ -50,6 +50,7 @@
 {
   static TypeId tid = TypeId ("ns3::YansWifiPhy")
     .SetParent<WifiPhy> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<YansWifiPhy> ()
     .AddAttribute ("EnergyDetectionThreshold",
                    "The energy of a received signal should be higher than "