diff --git a/src/mesh/model/dot11s/airtime-metric.cc b/src/mesh/model/dot11s/airtime-metric.cc
index 225bd61ac..81ff69ee2 100644
--- a/src/mesh/model/dot11s/airtime-metric.cc
+++ b/src/mesh/model/dot11s/airtime-metric.cc
@@ -32,6 +32,7 @@ AirtimeLinkMetricCalculator::GetTypeId ()
 {
   static TypeId tid = TypeId ("ns3::dot11s::AirtimeLinkMetricCalculator")
     .SetParent<Object> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<AirtimeLinkMetricCalculator> ()
     .AddAttribute ( "TestLength",
                     "Rate should be estimated using test length.",
diff --git a/src/mesh/model/dot11s/dot11s-mac-header.cc b/src/mesh/model/dot11s/dot11s-mac-header.cc
index 825d13e40..ebd5e376c 100644
--- a/src/mesh/model/dot11s/dot11s-mac-header.cc
+++ b/src/mesh/model/dot11s/dot11s-mac-header.cc
@@ -33,6 +33,7 @@ MeshHeader::GetTypeId ()
 {
   static TypeId tid = TypeId ("ns3::Dot11sMacHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<MeshHeader> ();
   return tid;
 }
diff --git a/src/mesh/model/dot11s/hwmp-protocol.cc b/src/mesh/model/dot11s/hwmp-protocol.cc
index e8cd7870e..d072e6d8d 100644
--- a/src/mesh/model/dot11s/hwmp-protocol.cc
+++ b/src/mesh/model/dot11s/hwmp-protocol.cc
@@ -49,6 +49,7 @@ HwmpProtocol::GetTypeId ()
 {
   static TypeId tid = TypeId ("ns3::dot11s::HwmpProtocol")
     .SetParent<MeshL2RoutingProtocol> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<HwmpProtocol> ()
     .AddAttribute ( "RandomStart",
                     "Random delay at first proactive PREQ",
diff --git a/src/mesh/model/dot11s/hwmp-rtable.cc b/src/mesh/model/dot11s/hwmp-rtable.cc
index 392070a04..b66d60d29 100644
--- a/src/mesh/model/dot11s/hwmp-rtable.cc
+++ b/src/mesh/model/dot11s/hwmp-rtable.cc
@@ -39,6 +39,7 @@ HwmpRtable::GetTypeId ()
 {
   static TypeId tid = TypeId ("ns3::dot11s::HwmpRtable")
     .SetParent<Object> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<HwmpRtable> ();
   return tid;
 }
diff --git a/src/mesh/model/dot11s/hwmp-tag.cc b/src/mesh/model/dot11s/hwmp-tag.cc
index f37f60921..3c4d1a7ef 100644
--- a/src/mesh/model/dot11s/hwmp-tag.cc
+++ b/src/mesh/model/dot11s/hwmp-tag.cc
@@ -86,7 +86,7 @@ HwmpTag::GetSeqno ()
 TypeId
 HwmpTag::GetTypeId ()
 {
-  static TypeId tid = TypeId ("ns3::dot11s::HwmpTag").SetParent<Tag> ().AddConstructor<HwmpTag> ();
+  static TypeId tid = TypeId ("ns3::dot11s::HwmpTag").SetParent<Tag> ().AddConstructor<HwmpTag> ().SetGroupName ("Mesh");
   return tid;
 }
 
diff --git a/src/mesh/model/dot11s/peer-link-frame.cc b/src/mesh/model/dot11s/peer-link-frame.cc
index eeba6deda..2036c48d0 100644
--- a/src/mesh/model/dot11s/peer-link-frame.cc
+++ b/src/mesh/model/dot11s/peer-link-frame.cc
@@ -85,8 +85,11 @@ PeerLinkFrameStart::GetFields () const
 TypeId
 PeerLinkFrameStart::GetTypeId ()
 {
-  static TypeId tid = TypeId ("ns3::dot11s::PeerLinkFrameStart").SetParent<Header> ().AddConstructor<
-      PeerLinkFrameStart> ();
+  static TypeId tid = TypeId ("ns3::dot11s::PeerLinkFrameStart")
+    .SetParent<Header> ()
+    .SetGroupName ("Mesh")
+    .AddConstructor<PeerLinkFrameStart> ()
+  ;
   return tid;
 }
 TypeId
diff --git a/src/mesh/model/dot11s/peer-link.cc b/src/mesh/model/dot11s/peer-link.cc
index 630903fc0..1376f714d 100644
--- a/src/mesh/model/dot11s/peer-link.cc
+++ b/src/mesh/model/dot11s/peer-link.cc
@@ -39,6 +39,7 @@ PeerLink::GetTypeId ()
 {
   static TypeId tid = TypeId ("ns3::dot11s::PeerLink")
     .SetParent<Object> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<PeerLink> ()
     .AddAttribute ( "RetryTimeout",
                     "Retry timeout",
diff --git a/src/mesh/model/dot11s/peer-management-protocol.cc b/src/mesh/model/dot11s/peer-management-protocol.cc
index 26dd08bee..d94d3ff0b 100644
--- a/src/mesh/model/dot11s/peer-management-protocol.cc
+++ b/src/mesh/model/dot11s/peer-management-protocol.cc
@@ -49,6 +49,7 @@ PeerManagementProtocol::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::dot11s::PeerManagementProtocol")
     .SetParent<Object> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<PeerManagementProtocol> ()
     // maximum number of peer links. Now we calculate the total
     // number of peer links on all interfaces
diff --git a/src/mesh/model/flame/flame-header.cc b/src/mesh/model/flame/flame-header.cc
index af7b48637..23e7f283e 100644
--- a/src/mesh/model/flame/flame-header.cc
+++ b/src/mesh/model/flame/flame-header.cc
@@ -40,6 +40,7 @@ FlameHeader::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::flame::FlameHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<FlameHeader> ();
   return tid;
 }
diff --git a/src/mesh/model/flame/flame-protocol.cc b/src/mesh/model/flame/flame-protocol.cc
index fc2eaba96..bb8608c74 100644
--- a/src/mesh/model/flame/flame-protocol.cc
+++ b/src/mesh/model/flame/flame-protocol.cc
@@ -46,7 +46,7 @@ NS_OBJECT_ENSURE_REGISTERED (FlameProtocol);
 TypeId
 FlameTag::GetTypeId ()
 {
-  static TypeId tid = TypeId ("ns3::flame::FlameTag").SetParent<Tag> ().AddConstructor<FlameTag> ();
+  static TypeId tid = TypeId ("ns3::flame::FlameTag").SetParent<Tag> ().AddConstructor<FlameTag> ().SetGroupName ("Mesh");
   return tid;
 }
 
@@ -110,6 +110,7 @@ FlameProtocol::GetTypeId ()
 {
   static TypeId tid = TypeId ("ns3::flame::FlameProtocol")
     .SetParent<MeshL2RoutingProtocol> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<FlameProtocol> ()
     .AddAttribute ( "BroadcastInterval",
                     "How often we must send broadcast packets",
diff --git a/src/mesh/model/flame/flame-rtable.cc b/src/mesh/model/flame/flame-rtable.cc
index 3b3ce2372..a755a22c7 100644
--- a/src/mesh/model/flame/flame-rtable.cc
+++ b/src/mesh/model/flame/flame-rtable.cc
@@ -38,6 +38,7 @@ FlameRtable::GetTypeId ()
   static TypeId tid =
     TypeId ("ns3::flame::FlameRtable")
     .SetParent<Object> ().AddConstructor<FlameRtable> ()
+    .SetGroupName ("Mesh")
     .AddAttribute ( "Lifetime",
                     "The lifetime of the routing enrty",
                     TimeValue (Seconds (120)), MakeTimeAccessor (
diff --git a/src/mesh/model/mesh-l2-routing-protocol.cc b/src/mesh/model/mesh-l2-routing-protocol.cc
index 836e765fd..ab0d891f1 100644
--- a/src/mesh/model/mesh-l2-routing-protocol.cc
+++ b/src/mesh/model/mesh-l2-routing-protocol.cc
@@ -33,7 +33,9 @@ TypeId
 MeshL2RoutingProtocol::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::MeshL2RoutingProtocol")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName ("Mesh")
+  ;
   return tid;
 }
 
diff --git a/src/mesh/model/mesh-point-device.cc b/src/mesh/model/mesh-point-device.cc
index 9739f50f0..899728b1d 100644
--- a/src/mesh/model/mesh-point-device.cc
+++ b/src/mesh/model/mesh-point-device.cc
@@ -38,6 +38,7 @@ MeshPointDevice::GetTypeId ()
 {
   static TypeId tid = TypeId ("ns3::MeshPointDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<MeshPointDevice> ()
     .AddAttribute ("Mtu", "The MAC-level Maximum Transmission Unit",
                    UintegerValue (0xffff),
diff --git a/src/mesh/model/mesh-wifi-interface-mac.cc b/src/mesh/model/mesh-wifi-interface-mac.cc
index 4e9e5845f..7f0a53713 100644
--- a/src/mesh/model/mesh-wifi-interface-mac.cc
+++ b/src/mesh/model/mesh-wifi-interface-mac.cc
@@ -47,6 +47,7 @@ MeshWifiInterfaceMac::GetTypeId ()
 {
   static TypeId tid = TypeId ("ns3::MeshWifiInterfaceMac")
     .SetParent<RegularWifiMac> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<MeshWifiInterfaceMac> ()
     .AddAttribute ( "BeaconInterval",
                     "Beacon Interval",