--- a/src/spectrum/model/aloha-noack-mac-header.cc	Sun Mar 29 16:23:12 2015 +0200
+++ b/src/spectrum/model/aloha-noack-mac-header.cc	Sun Mar 29 16:22:52 2015 +0200
@@ -33,6 +33,7 @@
 {
   static TypeId tid = TypeId ("ns3::AlohaNoackMacHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<AlohaNoackMacHeader> ()
   ;
   return tid;

--- a/src/spectrum/model/aloha-noack-net-device.cc	Sun Mar 29 16:23:12 2015 +0200
+++ b/src/spectrum/model/aloha-noack-net-device.cc	Sun Mar 29 16:22:52 2015 +0200
@@ -60,6 +60,7 @@
 {
   static TypeId tid = TypeId ("ns3::AlohaNoackNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<AlohaNoackNetDevice> ()
     .AddAttribute ("Address",
                    "The MAC address of this device.",

--- a/src/spectrum/model/constant-spectrum-propagation-loss.cc	Sun Mar 29 16:23:12 2015 +0200
+++ b/src/spectrum/model/constant-spectrum-propagation-loss.cc	Sun Mar 29 16:22:52 2015 +0200
@@ -47,6 +47,7 @@
 {
   static TypeId tid = TypeId ("ns3::ConstantSpectrumPropagationLossModel")
     .SetParent<SpectrumPropagationLossModel> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<ConstantSpectrumPropagationLossModel> ()
     .AddAttribute ("Loss",
                    "Path loss (dB) between transmitter and receiver",

--- a/src/spectrum/model/friis-spectrum-propagation-loss.cc	Sun Mar 29 16:23:12 2015 +0200
+++ b/src/spectrum/model/friis-spectrum-propagation-loss.cc	Sun Mar 29 16:22:52 2015 +0200
@@ -42,6 +42,7 @@
 {
   static TypeId tid = TypeId ("ns3::FriisSpectrumPropagationLossModel")
     .SetParent<SpectrumPropagationLossModel> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<FriisSpectrumPropagationLossModel> ()
   ;
   return tid;

--- a/src/spectrum/model/multi-model-spectrum-channel.cc	Sun Mar 29 16:23:12 2015 +0200
+++ b/src/spectrum/model/multi-model-spectrum-channel.cc	Sun Mar 29 16:22:52 2015 +0200
@@ -97,6 +97,7 @@
 {
   static TypeId tid = TypeId ("ns3::MultiModelSpectrumChannel")
     .SetParent<SpectrumChannel> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<MultiModelSpectrumChannel> ()
     .AddAttribute ("MaxLossDb",
                    "If a single-frequency PropagationLossModel is used, "

--- a/src/spectrum/model/non-communicating-net-device.cc	Sun Mar 29 16:23:12 2015 +0200
+++ b/src/spectrum/model/non-communicating-net-device.cc	Sun Mar 29 16:22:52 2015 +0200
@@ -40,6 +40,7 @@
 {
   static TypeId tid = TypeId ("ns3::NonCommunicatingNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<NonCommunicatingNetDevice> ()
     .AddAttribute ("Phy", "The PHY layer attached to this device.",
                    PointerValue (),

--- a/src/spectrum/model/single-model-spectrum-channel.cc	Sun Mar 29 16:23:12 2015 +0200
+++ b/src/spectrum/model/single-model-spectrum-channel.cc	Sun Mar 29 16:22:52 2015 +0200
@@ -67,6 +67,7 @@
   NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::SingleModelSpectrumChannel")
     .SetParent<SpectrumChannel> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<SingleModelSpectrumChannel> ()
     .AddAttribute ("MaxLossDb",
                    "If a single-frequency PropagationLossModel is used, "

--- a/src/spectrum/model/spectrum-analyzer.cc	Sun Mar 29 16:23:12 2015 +0200
+++ b/src/spectrum/model/spectrum-analyzer.cc	Sun Mar 29 16:22:52 2015 +0200
@@ -71,6 +71,7 @@
 {
   static TypeId tid = TypeId ("ns3::SpectrumAnalyzer")
     .SetParent<SpectrumPhy> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<SpectrumAnalyzer> ()
     .AddAttribute ("Resolution",
                    "The lengh of the time interval over which the "

--- a/src/spectrum/model/spectrum-channel.cc	Sun Mar 29 16:23:12 2015 +0200
+++ b/src/spectrum/model/spectrum-channel.cc	Sun Mar 29 16:22:52 2015 +0200
@@ -31,6 +31,7 @@
 {
   static TypeId tid = TypeId ("ns3::SpectrumChannel")
     .SetParent<Channel> ()
+    .SetGroupName ("Spectrum")
   ;
   return tid;
 }

--- a/src/spectrum/model/spectrum-error-model.cc	Sun Mar 29 16:23:12 2015 +0200
+++ b/src/spectrum/model/spectrum-error-model.cc	Sun Mar 29 16:22:52 2015 +0200
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::SpectrumErrorModel")
     .SetParent<Object> ()
+    .SetGroupName ("Spectrum")
     ;
   return tid;
 }

--- a/src/spectrum/model/spectrum-phy.cc	Sun Mar 29 16:23:12 2015 +0200
+++ b/src/spectrum/model/spectrum-phy.cc	Sun Mar 29 16:22:52 2015 +0200
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::SpectrumPhy")
     .SetParent<Object> ()
+    .SetGroupName ("Spectrum")
   ;
   return tid;
 }

--- a/src/spectrum/model/spectrum-propagation-loss-model.cc	Sun Mar 29 16:23:12 2015 +0200
+++ b/src/spectrum/model/spectrum-propagation-loss-model.cc	Sun Mar 29 16:22:52 2015 +0200
@@ -48,6 +48,7 @@
 {
   static TypeId tid = TypeId ("ns3::SpectrumPropagationLossModel")
     .SetParent<Object> ()
+    .SetGroupName ("Spectrum")
   ;
   return tid;
 }

--- a/src/spectrum/model/waveform-generator.cc	Sun Mar 29 16:23:12 2015 +0200
+++ b/src/spectrum/model/waveform-generator.cc	Sun Mar 29 16:22:52 2015 +0200
@@ -69,6 +69,7 @@
 {
   static TypeId tid = TypeId ("ns3::WaveformGenerator")
     .SetParent<SpectrumPhy> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<WaveformGenerator> ()
     .AddAttribute ("Period",
                    "the period (=1/frequency)",