diff --git a/src/buildings/helper/building-allocator.cc b/src/buildings/helper/building-allocator.cc
index eda20a556..dd8abb6eb 100644
--- a/src/buildings/helper/building-allocator.cc
+++ b/src/buildings/helper/building-allocator.cc
@@ -51,6 +51,7 @@ GridBuildingAllocator::GetTypeId (void)
   static TypeId tid = TypeId ("ns3::GridBuildingAllocator")
     .SetParent<Object> ()
     .AddConstructor<GridBuildingAllocator> ()
+    .SetGroupName ("Buildings")
     .AddAttribute ("GridWidth", "The number of objects layed out on a line.",
                    UintegerValue (10),
                    MakeUintegerAccessor (&GridBuildingAllocator::m_n),
diff --git a/src/buildings/helper/building-position-allocator.cc b/src/buildings/helper/building-position-allocator.cc
index e745fb8ec..b3507f9a5 100644
--- a/src/buildings/helper/building-position-allocator.cc
+++ b/src/buildings/helper/building-position-allocator.cc
@@ -50,7 +50,7 @@ RandomBuildingPositionAllocator::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::RandomBuildingPositionAllocator")
     .SetParent<PositionAllocator> ()
-    .SetGroupName ("Mobility")
+    .SetGroupName ("Buildings")
     .AddConstructor<RandomBuildingPositionAllocator> ()
     .AddAttribute ("WithReplacement",
                    "If true, the building will be randomly selected with replacement. "
@@ -117,7 +117,7 @@ RandomRoomPositionAllocator::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::RandomRoomPositionAllocator")
     .SetParent<PositionAllocator> ()
-    .SetGroupName ("Mobility")
+    .SetGroupName ("Buildings")
     .AddConstructor<RandomRoomPositionAllocator> ();
   return tid;
 }
@@ -221,7 +221,7 @@ SameRoomPositionAllocator::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::SameRoomPositionAllocator")
     .SetParent<PositionAllocator> ()
-    .SetGroupName ("Mobility")
+    .SetGroupName ("Buildings")
     .AddConstructor<SameRoomPositionAllocator> ();
   return tid;
 }
@@ -303,7 +303,7 @@ FixedRoomPositionAllocator::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::FixedRoomPositionAllocator")
     .SetParent<PositionAllocator> ()
-    .SetGroupName ("Mobility")
+    .SetGroupName ("Buildings")
     .AddConstructor<SameRoomPositionAllocator> ();
   return tid;
 }
diff --git a/src/buildings/model/building-list.cc b/src/buildings/model/building-list.cc
index 063870de3..8e4897977 100644
--- a/src/buildings/model/building-list.cc
+++ b/src/buildings/model/building-list.cc
@@ -64,6 +64,7 @@ BuildingListPriv::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::BuildingListPriv")
     .SetParent<Object> ()
+    .SetGroupName ("Buildings")
     .AddAttribute ("BuildingList", "The list of all buildings created during the simulation.",
                    ObjectVectorValue (),
                    MakeObjectVectorAccessor (&BuildingListPriv::m_buildings),
diff --git a/src/buildings/model/building.cc b/src/buildings/model/building.cc
index 1457b4385..c5e7428c1 100644
--- a/src/buildings/model/building.cc
+++ b/src/buildings/model/building.cc
@@ -41,6 +41,7 @@ Building::GetTypeId (void)
   static TypeId tid = TypeId ("ns3::Building")
     .SetParent<Object> ()
     .AddConstructor<Building> ()
+    .SetGroupName ("Buildings")
     .AddAttribute ("NRoomsX", "The number of rooms in the X axis.",
                    UintegerValue (1),
                    MakeUintegerAccessor (&Building::GetNRoomsX, &Building::SetNRoomsX),
diff --git a/src/buildings/model/buildings-propagation-loss-model.cc b/src/buildings/model/buildings-propagation-loss-model.cc
index 0a396d099..fc1a762db 100644
--- a/src/buildings/model/buildings-propagation-loss-model.cc
+++ b/src/buildings/model/buildings-propagation-loss-model.cc
@@ -65,6 +65,7 @@ BuildingsPropagationLossModel::GetTypeId (void)
   static TypeId tid = TypeId ("ns3::BuildingsPropagationLossModel")
 
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Buildings")
 
 
     .AddAttribute ("ShadowSigmaOutdoor",
diff --git a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc
index a8a883b14..9fb13439e 100644
--- a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc
+++ b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc
@@ -66,6 +66,7 @@ HybridBuildingsPropagationLossModel::GetTypeId (void)
     .SetParent<BuildingsPropagationLossModel> ()
     
     .AddConstructor<HybridBuildingsPropagationLossModel> ()
+    .SetGroupName ("Buildings")
     
     .AddAttribute ("Frequency",
                    "The Frequency  (default is 2.106 GHz).",
diff --git a/src/buildings/model/itu-r-1238-propagation-loss-model.cc b/src/buildings/model/itu-r-1238-propagation-loss-model.cc
index a5aeaaccf..f136d2ea2 100644
--- a/src/buildings/model/itu-r-1238-propagation-loss-model.cc
+++ b/src/buildings/model/itu-r-1238-propagation-loss-model.cc
@@ -41,6 +41,7 @@ ItuR1238PropagationLossModel::GetTypeId (void)
   static TypeId tid = TypeId ("ns3::ItuR1238PropagationLossModel")
 
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Buildings")
 
     .AddAttribute ("Frequency",
                    "The Frequency  (default is 2.106 GHz).",
diff --git a/src/buildings/model/mobility-building-info.cc b/src/buildings/model/mobility-building-info.cc
index 344dbe318..7ea9406ff 100644
--- a/src/buildings/model/mobility-building-info.cc
+++ b/src/buildings/model/mobility-building-info.cc
@@ -37,7 +37,7 @@ MobilityBuildingInfo::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::MobilityBuildingInfo")
     .SetParent<Object> ()
-    .SetGroupName ("Building")
+    .SetGroupName ("Buildings")
     .AddConstructor<MobilityBuildingInfo> ();
 
   return tid;
diff --git a/src/buildings/model/oh-buildings-propagation-loss-model.cc b/src/buildings/model/oh-buildings-propagation-loss-model.cc
index b90a6a57d..a4b953a1d 100644
--- a/src/buildings/model/oh-buildings-propagation-loss-model.cc
+++ b/src/buildings/model/oh-buildings-propagation-loss-model.cc
@@ -54,6 +54,7 @@ OhBuildingsPropagationLossModel::GetTypeId (void)
   static TypeId tid = TypeId ("ns3::OhBuildingsPropagationLossModel")
   
   .SetParent<BuildingsPropagationLossModel> ()
+  .SetGroupName ("Buildings")
   
   .AddConstructor<OhBuildingsPropagationLossModel> ();