--- a/src/energy/helper/energy-harvester-container.cc	Sun Mar 29 16:08:40 2015 +0200
+++ b/src/energy/helper/energy-harvester-container.cc	Sun Mar 29 16:12:50 2015 +0200
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::EnergyHarvesterContainer")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
     .AddConstructor<EnergyHarvesterContainer> ()
   ;
   return tid;

--- a/src/energy/helper/energy-source-container.cc	Sun Mar 29 16:08:40 2015 +0200
+++ b/src/energy/helper/energy-source-container.cc	Sun Mar 29 16:12:50 2015 +0200
@@ -32,6 +32,7 @@
 {
   static TypeId tid = TypeId ("ns3::EnergySourceContainer")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
     .AddConstructor<EnergySourceContainer> ()
   ;
   return tid;

--- a/src/energy/model/basic-energy-harvester.cc	Sun Mar 29 16:08:40 2015 +0200
+++ b/src/energy/model/basic-energy-harvester.cc	Sun Mar 29 16:12:50 2015 +0200
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::BasicEnergyHarvester")
   .SetParent<EnergyHarvester> ()
+  .SetGroupName ("Energy")
   .AddConstructor<BasicEnergyHarvester> ()
   .AddAttribute ("PeriodicHarvestedPowerUpdateInterval",
                  "Time between two consecutive periodic updates of the harvested power. By default, the value is updated every 1 s",

--- a/src/energy/model/basic-energy-source.cc	Sun Mar 29 16:08:40 2015 +0200
+++ b/src/energy/model/basic-energy-source.cc	Sun Mar 29 16:12:50 2015 +0200
@@ -36,6 +36,7 @@
 {
   static TypeId tid = TypeId ("ns3::BasicEnergySource")
     .SetParent<EnergySource> ()
+    .SetGroupName ("Energy")
     .AddConstructor<BasicEnergySource> ()
     .AddAttribute ("BasicEnergySourceInitialEnergyJ",
                    "Initial energy stored in basic energy source.",

--- a/src/energy/model/device-energy-model.cc	Sun Mar 29 16:08:40 2015 +0200
+++ b/src/energy/model/device-energy-model.cc	Sun Mar 29 16:12:50 2015 +0200
@@ -32,6 +32,7 @@
 {
   static TypeId tid = TypeId ("ns3::DeviceEnergyModel")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
   ;
   return tid;
 }

--- a/src/energy/model/energy-harvester.cc	Sun Mar 29 16:08:40 2015 +0200
+++ b/src/energy/model/energy-harvester.cc	Sun Mar 29 16:12:50 2015 +0200
@@ -33,6 +33,7 @@
 {
   static TypeId tid = TypeId ("ns3::EnergyHarvester")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
   ;
   return tid;
 }

--- a/src/energy/model/energy-source.cc	Sun Mar 29 16:08:40 2015 +0200
+++ b/src/energy/model/energy-source.cc	Sun Mar 29 16:12:50 2015 +0200
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::EnergySource")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
   ;
   return tid;
 }

--- a/src/energy/model/li-ion-energy-source.cc	Sun Mar 29 16:08:40 2015 +0200
+++ b/src/energy/model/li-ion-energy-source.cc	Sun Mar 29 16:12:50 2015 +0200
@@ -38,6 +38,7 @@
 {
   static TypeId tid = TypeId ("ns3::LiIonEnergySource")
     .SetParent<EnergySource> ()
+    .SetGroupName ("Energy")
     .AddConstructor<LiIonEnergySource> ()
     .AddAttribute ("LiIonEnergySourceInitialEnergyJ",
                    "Initial energy stored in basic energy source.",

--- a/src/energy/model/rv-battery-model.cc	Sun Mar 29 16:08:40 2015 +0200
+++ b/src/energy/model/rv-battery-model.cc	Sun Mar 29 16:12:50 2015 +0200
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::RvBatteryModel")
     .SetParent<EnergySource> ()
+    .SetGroupName ("Energy")
     .AddConstructor<RvBatteryModel> ()
     .AddAttribute ("RvBatteryModelPeriodicEnergyUpdateInterval",
                    "RV battery model sampling interval.",

--- a/src/energy/model/simple-device-energy-model.cc	Sun Mar 29 16:08:40 2015 +0200
+++ b/src/energy/model/simple-device-energy-model.cc	Sun Mar 29 16:12:50 2015 +0200
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::SimpleDeviceEnergyModel")
     .SetParent<DeviceEnergyModel> ()
+    .SetGroupName ("Energy")
     .AddConstructor<SimpleDeviceEnergyModel> ()
     .AddTraceSource ("TotalEnergyConsumption",
                      "Total energy consumption of the radio device.",

--- a/src/energy/model/wifi-radio-energy-model.cc	Sun Mar 29 16:08:40 2015 +0200
+++ b/src/energy/model/wifi-radio-energy-model.cc	Sun Mar 29 16:12:50 2015 +0200
@@ -38,6 +38,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiRadioEnergyModel")
     .SetParent<DeviceEnergyModel> ()
+    .SetGroupName ("Energy")
     .AddConstructor<WifiRadioEnergyModel> ()
     .AddAttribute ("IdleCurrentA",
                    "The default radio Idle current in Ampere.",

--- a/src/energy/model/wifi-tx-current-model.cc	Sun Mar 29 16:08:40 2015 +0200
+++ b/src/energy/model/wifi-tx-current-model.cc	Sun Mar 29 16:12:50 2015 +0200
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiTxCurrentModel")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
   ;
   return tid;
 }