diff --git a/src/mobility/model/position-allocator.cc b/src/mobility/model/position-allocator.cc
index b5fb89543..8aa8cfa6a 100644
--- a/src/mobility/model/position-allocator.cc
+++ b/src/mobility/model/position-allocator.cc
@@ -36,7 +36,8 @@ TypeId
 PositionAllocator::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::PositionAllocator")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName ("Mobility");
   return tid;
 }
 
@@ -55,6 +56,7 @@ ListPositionAllocator::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::ListPositionAllocator")
     .SetParent<PositionAllocator> ()
+    .SetGroupName ("Mobility")
     .AddConstructor<ListPositionAllocator> ()
   ;
   return tid;
diff --git a/src/propagation/model/propagation-loss-model.cc b/src/propagation/model/propagation-loss-model.cc
index b0fe1ba66..4799eba79 100644
--- a/src/propagation/model/propagation-loss-model.cc
+++ b/src/propagation/model/propagation-loss-model.cc
@@ -43,6 +43,7 @@ PropagationLossModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::PropagationLossModel")
     .SetParent<Object> ()
+    .SetGroupName ("Propagation")
   ;
   return tid;
 }
@@ -102,6 +103,7 @@ RandomPropagationLossModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::RandomPropagationLossModel")
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<RandomPropagationLossModel> ()
     .AddAttribute ("Variable", "The random variable used to pick a loss everytime CalcRxPower is invoked.",
                    StringValue ("ns3::ConstantRandomVariable[Constant=1.0]"),
@@ -285,6 +287,7 @@ TwoRayGroundPropagationLossModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::TwoRayGroundPropagationLossModel")
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<TwoRayGroundPropagationLossModel> ()
     .AddAttribute ("Frequency", 
                    "The carrier frequency (in Hz) at which propagation occurs  (default is 5.15 GHz).",
@@ -546,6 +549,7 @@ ThreeLogDistancePropagationLossModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::ThreeLogDistancePropagationLossModel")
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<ThreeLogDistancePropagationLossModel> ()
     .AddAttribute ("Distance0",
                    "Beginning of the first (near) distance field",
@@ -889,6 +893,7 @@ RangePropagationLossModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::RangePropagationLossModel")
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<RangePropagationLossModel> ()
     .AddAttribute ("MaxRange",
                    "Maximum Transmission Range (meters)",
diff --git a/src/spectrum/model/half-duplex-ideal-phy.cc b/src/spectrum/model/half-duplex-ideal-phy.cc
index bb6c29c0b..17b54d966 100644
--- a/src/spectrum/model/half-duplex-ideal-phy.cc
+++ b/src/spectrum/model/half-duplex-ideal-phy.cc
@@ -103,6 +103,7 @@ HalfDuplexIdealPhy::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::HalfDuplexIdealPhy")
     .SetParent<SpectrumPhy> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<HalfDuplexIdealPhy> ()
     .AddAttribute ("Rate",
                    "The PHY rate used by this device",
diff --git a/src/traffic-control/model/packet-filter.cc b/src/traffic-control/model/packet-filter.cc
index 60218b1c5..04b22db79 100644
--- a/src/traffic-control/model/packet-filter.cc
+++ b/src/traffic-control/model/packet-filter.cc
@@ -32,6 +32,7 @@ PacketFilter::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::PacketFilter")
     .SetParent<Object> ()
+    .SetGroupName ("TrafficControl")
   ;
   return tid;
 }
diff --git a/src/wifi/model/dcf.cc b/src/wifi/model/dcf.cc
index f51bb6c0a..034333ce9 100644
--- a/src/wifi/model/dcf.cc
+++ b/src/wifi/model/dcf.cc
@@ -33,6 +33,7 @@ Dcf::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::Dcf")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
     .AddAttribute ("MinCw", "The minimum value of the contention window.",
                    UintegerValue (15),
                    MakeUintegerAccessor (&Dcf::SetMinCw,
diff --git a/src/wifi/model/wifi-spectrum-phy-interface.cc b/src/wifi/model/wifi-spectrum-phy-interface.cc
index 18b696c1b..9a1b3bb7d 100644
--- a/src/wifi/model/wifi-spectrum-phy-interface.cc
+++ b/src/wifi/model/wifi-spectrum-phy-interface.cc
@@ -42,7 +42,8 @@ TypeId
 WifiSpectrumPhyInterface::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::WifiSpectrumPhyInterface")
-    .SetParent<SpectrumPhy> ();
+    .SetParent<SpectrumPhy> ()
+    .SetGroupName ("Wifi");
   return tid;
 }
 
diff --git a/src/wifi/model/wifi-tx-current-model.cc b/src/wifi/model/wifi-tx-current-model.cc
index bddd822f6..2cbe52998 100644
--- a/src/wifi/model/wifi-tx-current-model.cc
+++ b/src/wifi/model/wifi-tx-current-model.cc
@@ -39,7 +39,7 @@ WifiTxCurrentModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::WifiTxCurrentModel")
     .SetParent<Object> ()
-    .SetGroupName ("Energy")
+    .SetGroupName ("Wifi")
   ;
   return tid;
 }
@@ -68,6 +68,7 @@ LinearWifiTxCurrentModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::LinearWifiTxCurrentModel")
     .SetParent<WifiTxCurrentModel> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<LinearWifiTxCurrentModel> ()
     .AddAttribute ("Eta", "The efficiency of the power amplifier.",
                    DoubleValue (0.10),