--- a/src/wimax/model/bandwidth-manager.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/bandwidth-manager.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -42,7 +42,8 @@
 TypeId BandwidthManager::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::BandwidthManager")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 

--- a/src/wimax/model/bs-link-manager.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/bs-link-manager.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -41,7 +41,8 @@
 TypeId BSLinkManager::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::BSLinkManager")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 

--- a/src/wimax/model/bs-net-device.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/bs-net-device.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -58,6 +58,8 @@
 
     .SetParent<WimaxNetDevice> ()
 
+    .SetGroupName("Wimax")
+
     .AddConstructor<BaseStationNetDevice> ()
 
     .AddAttribute ("BSScheduler",

--- a/src/wimax/model/bs-scheduler-rtps.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/bs-scheduler-rtps.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -46,7 +46,7 @@
 TypeId
 BSSchedulerRtps::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::BSSchedulerRtps").SetParent<Object> ().AddConstructor<BSSchedulerRtps> ();
+  static TypeId tid = TypeId ("ns3::BSSchedulerRtps").SetParent<Object> ().SetGroupName("Wimax").AddConstructor<BSSchedulerRtps> ();
   return tid;
 }
 

--- a/src/wimax/model/bs-scheduler-simple.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/bs-scheduler-simple.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -43,7 +43,7 @@
 
 TypeId BSSchedulerSimple::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::BSSchedulerSimple").SetParent<Object> ().AddConstructor<BSSchedulerSimple> ();
+  static TypeId tid = TypeId ("ns3::BSSchedulerSimple").SetParent<Object> ().SetGroupName("Wimax").AddConstructor<BSSchedulerSimple> ();
   return tid;
 }
 

--- a/src/wimax/model/bs-scheduler.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/bs-scheduler.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -44,7 +44,7 @@
 TypeId
 BSScheduler::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::BSScheduler").SetParent<Object> ();
+  static TypeId tid = TypeId ("ns3::BSScheduler").SetParent<Object> ().SetGroupName("Wimax");
   return tid;
 }
 

--- a/src/wimax/model/bs-uplink-scheduler-mbqos.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/bs-uplink-scheduler-mbqos.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -58,6 +58,8 @@
 
     .SetParent<UplinkScheduler> ()
 
+    .SetGroupName("Wimax")
+
     .AddAttribute ("WindowInterval",
                    "The time to wait to reset window",
                    TimeValue (Seconds (1.0)),

--- a/src/wimax/model/bs-uplink-scheduler-rtps.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/bs-uplink-scheduler-rtps.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -71,7 +71,7 @@
 TypeId
 UplinkSchedulerRtps::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::UplinkSchedulerRtps").SetParent<UplinkScheduler> ();
+  static TypeId tid = TypeId ("ns3::UplinkSchedulerRtps").SetParent<UplinkScheduler> ().SetGroupName("Wimax");
   return tid;
 }
 

--- a/src/wimax/model/bs-uplink-scheduler-simple.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/bs-uplink-scheduler-simple.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -75,7 +75,7 @@
 TypeId
 UplinkSchedulerSimple::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::UplinkSchedulerSimple").SetParent<Object> ();
+  static TypeId tid = TypeId ("ns3::UplinkSchedulerSimple").SetParent<Object> ().SetGroupName("Wimax");
   return tid;
 }
 

--- a/src/wimax/model/bs-uplink-scheduler.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/bs-uplink-scheduler.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -76,6 +76,7 @@
 {
   static TypeId tid = TypeId ("ns3::UplinkScheduler")
     .SetParent<Object> ()
+    .SetGroupName("Wimax")
   ;
   return tid;
 }

--- a/src/wimax/model/burst-profile-manager.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/burst-profile-manager.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -36,7 +36,8 @@
 TypeId BurstProfileManager::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::BurstProfileManager")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 

--- a/src/wimax/model/connection-manager.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/connection-manager.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -40,7 +40,8 @@
 TypeId ConnectionManager::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::ConnectionManager")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 

--- a/src/wimax/model/dl-mac-messages.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/dl-mac-messages.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -384,6 +384,7 @@
 {
   static TypeId tid = TypeId ("ns3::Dcd")
     .SetParent<Header> ()
+    .SetGroupName("Wimax")
     .AddConstructor<Dcd> ()
   ;
   return tid;
@@ -603,6 +604,7 @@
 {
   static TypeId tid = TypeId ("ns3::DlMap")
     .SetParent<Header> ()
+    .SetGroupName("Wimax")
     .AddConstructor<DlMap> ()
   ;
   return tid;

--- a/src/wimax/model/ipcs-classifier.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/ipcs-classifier.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -40,7 +40,8 @@
 TypeId IpcsClassifier::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::IpcsClassifier")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 

--- a/src/wimax/model/mac-messages.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/mac-messages.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -68,7 +68,7 @@
 ManagementMessageType::GetTypeId (void)
 {
   static TypeId tid =
-    TypeId ("ns3::ManagementMessageType").SetParent<Header> ().AddConstructor<ManagementMessageType> ();
+    TypeId ("ns3::ManagementMessageType").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<ManagementMessageType> ();
   return tid;
 }
 
@@ -166,7 +166,7 @@
 TypeId
 RngReq::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::RngReq").SetParent<Header> ().AddConstructor<RngReq> ();
+  static TypeId tid = TypeId ("ns3::RngReq").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<RngReq> ();
   return tid;
 }
 
@@ -423,7 +423,7 @@
 TypeId
 RngRsp::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::RngRsp").SetParent<Header> ().AddConstructor<RngRsp> ();
+  static TypeId tid = TypeId ("ns3::RngRsp").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<RngRsp> ();
   return tid;
 }
 
@@ -564,7 +564,7 @@
 TypeId
 DsaReq::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::DsaReq").SetParent<Header> ().AddConstructor<DsaReq> ();
+  static TypeId tid = TypeId ("ns3::DsaReq").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<DsaReq> ();
   return tid;
 }
 
@@ -705,7 +705,7 @@
 TypeId
 DsaRsp::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::DsaRsp").SetParent<Header> ().AddConstructor<DsaRsp> ();
+  static TypeId tid = TypeId ("ns3::DsaRsp").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<DsaRsp> ();
   return tid;
 }
 
@@ -799,7 +799,7 @@
 TypeId
 DsaAck::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::DsaAck").SetParent<Header> ().AddConstructor<DsaAck> ();
+  static TypeId tid = TypeId ("ns3::DsaAck").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<DsaAck> ();
   return tid;
 }
 

--- a/src/wimax/model/service-flow-manager.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/service-flow-manager.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -49,7 +49,8 @@
 TypeId ServiceFlowManager::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::ServiceFlowManager")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 

--- a/src/wimax/model/ss-link-manager.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/ss-link-manager.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -40,7 +40,8 @@
 TypeId SSLinkManager::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::SSLinkManager")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 

--- a/src/wimax/model/ss-manager.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/ss-manager.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -34,7 +34,8 @@
 TypeId SSManager::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::SSManager")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 

--- a/src/wimax/model/ss-scheduler.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/ss-scheduler.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -40,7 +40,8 @@
 TypeId SSScheduler::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::SSScheduler")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 

--- a/src/wimax/model/ul-mac-messages.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/ul-mac-messages.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -376,6 +376,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ucd")
     .SetParent<Header> ()
+    .SetGroupName("Wimax")
     .AddConstructor<Ucd> ()
   ;
   return tid;
@@ -637,6 +638,7 @@
 {
   static TypeId tid = TypeId ("ns3::UlMap")
     .SetParent<Header> ()
+    .SetGroupName("Wimax")
     .AddConstructor<UlMap> ()
   ;
   return tid;

--- a/src/wimax/model/wimax-channel.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/wimax-channel.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -32,7 +32,8 @@
 TypeId WimaxChannel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::WimaxChannel")
-    .SetParent<Channel> ();
+    .SetParent<Channel> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 

--- a/src/wimax/model/wimax-connection.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/wimax-connection.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -35,6 +35,8 @@
 
     .SetParent<Object> ()
 
+    .SetGroupName("Wimax")
+
     .AddAttribute ("Type",
                    "Connection type",
                    EnumValue (Cid::INITIAL_RANGING),

--- a/src/wimax/model/wimax-mac-header.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/wimax-mac-header.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -62,7 +62,7 @@
 TypeId
 MacHeaderType::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::MacHeaderType").SetParent<Header> ().AddConstructor<MacHeaderType> ();
+  static TypeId tid = TypeId ("ns3::MacHeaderType").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<MacHeaderType> ();
   return tid;
 }
 
@@ -200,7 +200,7 @@
 
 TypeId GenericMacHeader::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::GenericMacHeader").SetParent<Header> ().AddConstructor<GenericMacHeader> ();
+  static TypeId tid = TypeId ("ns3::GenericMacHeader").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<GenericMacHeader> ();
   return tid;
 }
 
@@ -379,7 +379,7 @@
 
 TypeId BandwidthRequestHeader::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::BandwidthRequestHeader").SetParent<Header> ().AddConstructor<
+  static TypeId tid = TypeId ("ns3::BandwidthRequestHeader").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<
       BandwidthRequestHeader> ();
   return tid;
 }
@@ -528,7 +528,7 @@
 
 TypeId GrantManagementSubheader::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::GrantManagementSubheader").SetParent<Header> ().AddConstructor<
+  static TypeId tid = TypeId ("ns3::GrantManagementSubheader").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<
       GrantManagementSubheader> ();
   return tid;
 }
@@ -616,7 +616,7 @@
 FragmentationSubheader::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::FragmentationSubheader").SetParent<
-      Header> ().AddConstructor<FragmentationSubheader> ();
+      Header> ().SetGroupName("Wimax").AddConstructor<FragmentationSubheader> ();
   return tid;
 }
 

--- a/src/wimax/model/wimax-mac-queue.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/wimax-mac-queue.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -79,6 +79,7 @@
 {
   static TypeId tid = TypeId ("ns3::WimaxMacQueue")
     .SetParent<Object> ()
+    .SetGroupName("Wimax")
     .AddAttribute (
       "MaxSize",
       "Maximum size",

--- a/src/wimax/model/wimax-mac-to-mac-header.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/wimax-mac-to-mac-header.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -46,7 +46,7 @@
 WimaxMacToMacHeader::GetTypeId (void)
 {
   static TypeId tid =
-    TypeId ("ns3::WimaxMacToMacHeader").SetParent<Header> ().AddConstructor<WimaxMacToMacHeader> ();
+    TypeId ("ns3::WimaxMacToMacHeader").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<WimaxMacToMacHeader> ();
   return tid;
 }
 

--- a/src/wimax/model/wimax-phy.cc	Fri Apr 03 16:36:13 2015 -0700
+++ b/src/wimax/model/wimax-phy.cc	Sat Apr 04 08:22:44 2015 -0700
@@ -38,7 +38,7 @@
 
 TypeId WimaxPhy::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::WimaxPhy").SetParent<Object> ()
+  static TypeId tid = TypeId ("ns3::WimaxPhy").SetParent<Object> ().SetGroupName("Wimax")
 
     .AddAttribute ("Channel",
                    "Wimax channel",