From 915be071a204e620f7366eb3cdde224b9b4c5ece Mon Sep 17 00:00:00 2001
From: Eduardo Almeida <enmsa@outlook.pt>
Date: Tue, 2 Jul 2024 17:50:31 +0100
Subject: [PATCH] Standardize closing "// namespace ns3" comments

---
 src/buildings/model/buildings-channel-condition-model.cc        | 2 +-
 src/buildings/model/three-gpp-v2v-channel-condition-model.cc    | 2 +-
 src/config-store/model/display-functions.h                      | 2 +-
 src/config-store/model/model-node-creator.cc                    | 2 +-
 src/config-store/model/model-typeid-creator.cc                  | 2 +-
 src/core/helper/csv-reader.h                                    | 2 +-
 src/lte/model/a2-a4-rsrq-handover-algorithm.cc                  | 2 +-
 src/lte/model/a2-a4-rsrq-handover-algorithm.h                   | 2 +-
 src/lte/model/a3-rsrp-handover-algorithm.cc                     | 2 +-
 src/lte/model/a3-rsrp-handover-algorithm.h                      | 2 +-
 src/lte/model/ff-mac-csched-sap.h                               | 2 +-
 src/lte/model/lte-anr-sap.cc                                    | 2 +-
 src/lte/model/lte-anr-sap.h                                     | 2 +-
 src/lte/model/lte-anr.cc                                        | 2 +-
 src/lte/model/lte-anr.h                                         | 2 +-
 src/lte/model/lte-ccm-mac-sap.cc                                | 2 +-
 src/lte/model/lte-ccm-mac-sap.h                                 | 2 +-
 src/lte/model/lte-ccm-rrc-sap.cc                                | 2 +-
 src/lte/model/lte-ccm-rrc-sap.h                                 | 2 +-
 src/lte/model/lte-enb-component-carrier-manager.cc              | 2 +-
 src/lte/model/lte-enb-component-carrier-manager.h               | 2 +-
 src/lte/model/lte-enb-mac.h                                     | 2 +-
 src/lte/model/lte-ffr-algorithm.cc                              | 2 +-
 src/lte/model/lte-ffr-algorithm.h                               | 2 +-
 src/lte/model/lte-ffr-distributed-algorithm.cc                  | 2 +-
 src/lte/model/lte-ffr-distributed-algorithm.h                   | 2 +-
 src/lte/model/lte-ffr-enhanced-algorithm.cc                     | 2 +-
 src/lte/model/lte-ffr-enhanced-algorithm.h                      | 2 +-
 src/lte/model/lte-ffr-rrc-sap.h                                 | 2 +-
 src/lte/model/lte-ffr-sap.h                                     | 2 +-
 src/lte/model/lte-ffr-soft-algorithm.cc                         | 2 +-
 src/lte/model/lte-ffr-soft-algorithm.h                          | 2 +-
 src/lte/model/lte-fr-hard-algorithm.cc                          | 2 +-
 src/lte/model/lte-fr-hard-algorithm.h                           | 2 +-
 src/lte/model/lte-fr-no-op-algorithm.cc                         | 2 +-
 src/lte/model/lte-fr-no-op-algorithm.h                          | 2 +-
 src/lte/model/lte-fr-soft-algorithm.cc                          | 2 +-
 src/lte/model/lte-fr-soft-algorithm.h                           | 2 +-
 src/lte/model/lte-fr-strict-algorithm.cc                        | 2 +-
 src/lte/model/lte-fr-strict-algorithm.h                         | 2 +-
 src/lte/model/lte-handover-algorithm.cc                         | 2 +-
 src/lte/model/lte-handover-algorithm.h                          | 2 +-
 src/lte/model/lte-handover-management-sap.cc                    | 2 +-
 src/lte/model/lte-handover-management-sap.h                     | 2 +-
 src/lte/model/lte-ue-ccm-rrc-sap.cc                             | 2 +-
 src/lte/model/lte-ue-ccm-rrc-sap.h                              | 2 +-
 src/lte/model/lte-ue-component-carrier-manager.cc               | 2 +-
 src/lte/model/lte-ue-component-carrier-manager.h                | 2 +-
 src/lte/model/no-op-component-carrier-manager.cc                | 2 +-
 src/lte/model/no-op-component-carrier-manager.h                 | 2 +-
 src/lte/model/no-op-handover-algorithm.cc                       | 2 +-
 src/lte/model/no-op-handover-algorithm.h                        | 2 +-
 src/lte/model/simple-ue-component-carrier-manager.cc            | 2 +-
 src/lte/model/simple-ue-component-carrier-manager.h             | 2 +-
 src/lte/test/lte-ffr-simple.cc                                  | 2 +-
 src/lte/test/lte-ffr-simple.h                                   | 2 +-
 src/propagation/model/channel-condition-model.cc                | 2 +-
 .../model/probabilistic-v2v-channel-condition-model.cc          | 2 +-
 src/uan/helper/uan-helper.cc                                    | 2 +-
 src/uan/helper/uan-helper.h                                     | 2 +-
 60 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/src/buildings/model/buildings-channel-condition-model.cc b/src/buildings/model/buildings-channel-condition-model.cc
index f59814c77..d1ee42a07 100644
--- a/src/buildings/model/buildings-channel-condition-model.cc
+++ b/src/buildings/model/buildings-channel-condition-model.cc
@@ -181,4 +181,4 @@ BuildingsChannelConditionModel::AssignStreams(int64_t /* stream */)
     return 0;
 }
 
-} // end namespace ns3
+} // namespace ns3
diff --git a/src/buildings/model/three-gpp-v2v-channel-condition-model.cc b/src/buildings/model/three-gpp-v2v-channel-condition-model.cc
index 4280aeadb..64f696a99 100644
--- a/src/buildings/model/three-gpp-v2v-channel-condition-model.cc
+++ b/src/buildings/model/three-gpp-v2v-channel-condition-model.cc
@@ -202,4 +202,4 @@ ThreeGppV2vHighwayChannelConditionModel::GetChCondWithNoBuildings(Ptr<const Mobi
     return cond;
 }
 
-} // end namespace ns3
+} // namespace ns3
diff --git a/src/config-store/model/display-functions.h b/src/config-store/model/display-functions.h
index a66bec28d..1b101cbcc 100644
--- a/src/config-store/model/display-functions.h
+++ b/src/config-store/model/display-functions.h
@@ -228,6 +228,6 @@ gboolean clean_model_callback_config_default(GtkTreeModel* model,
                                              GtkTreePath* path,
                                              GtkTreeIter* iter,
                                              gpointer data);
-} // end namespace ns3
+} // namespace ns3
 
 #endif
diff --git a/src/config-store/model/model-node-creator.cc b/src/config-store/model/model-node-creator.cc
index 72a86bf6a..3019a7e22 100644
--- a/src/config-store/model/model-node-creator.cc
+++ b/src/config-store/model/model-node-creator.cc
@@ -127,4 +127,4 @@ ModelCreator::DoEndVisitArrayItem()
     g_free(iter);
     m_iters.pop_back();
 }
-} // end namespace ns3
+} // namespace ns3
diff --git a/src/config-store/model/model-typeid-creator.cc b/src/config-store/model/model-typeid-creator.cc
index bf83e6d04..45d96f452 100644
--- a/src/config-store/model/model-typeid-creator.cc
+++ b/src/config-store/model/model-typeid-creator.cc
@@ -71,4 +71,4 @@ ModelTypeidCreator::EndVisitTypeId()
 {
     Remove();
 }
-} // end namespace ns3
+} // namespace ns3
diff --git a/src/core/helper/csv-reader.h b/src/core/helper/csv-reader.h
index 14761c828..6dd748500 100644
--- a/src/core/helper/csv-reader.h
+++ b/src/core/helper/csv-reader.h
@@ -408,6 +408,6 @@ CsvReader::GetValue(std::size_t columnIndex, T& value) const
     return GetValueAs(std::move(cell), value);
 }
 
-} //  namespace ns3
+} // namespace ns3
 
 #endif //  NS3_CSV_READER_H_
diff --git a/src/lte/model/a2-a4-rsrq-handover-algorithm.cc b/src/lte/model/a2-a4-rsrq-handover-algorithm.cc
index 26b2ebd8c..de7dc4417 100644
--- a/src/lte/model/a2-a4-rsrq-handover-algorithm.cc
+++ b/src/lte/model/a2-a4-rsrq-handover-algorithm.cc
@@ -253,4 +253,4 @@ A2A4RsrqHandoverAlgorithm::UpdateNeighbourMeasurements(uint16_t rnti, uint16_t c
     }
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/a2-a4-rsrq-handover-algorithm.h b/src/lte/model/a2-a4-rsrq-handover-algorithm.h
index b96f59a1b..54abc2bbc 100644
--- a/src/lte/model/a2-a4-rsrq-handover-algorithm.h
+++ b/src/lte/model/a2-a4-rsrq-handover-algorithm.h
@@ -178,6 +178,6 @@ class A2A4RsrqHandoverAlgorithm : public LteHandoverAlgorithm
     LteHandoverManagementSapProvider* m_handoverManagementSapProvider;
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* A2_A4_RSRQ_HANDOVER_ALGORITHM_H */
diff --git a/src/lte/model/a3-rsrp-handover-algorithm.cc b/src/lte/model/a3-rsrp-handover-algorithm.cc
index a6ceec6bc..a79186052 100644
--- a/src/lte/model/a3-rsrp-handover-algorithm.cc
+++ b/src/lte/model/a3-rsrp-handover-algorithm.cc
@@ -172,4 +172,4 @@ A3RsrpHandoverAlgorithm::IsValidNeighbour(uint16_t cellId)
     return true;
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/a3-rsrp-handover-algorithm.h b/src/lte/model/a3-rsrp-handover-algorithm.h
index c75989d5d..e85e96aab 100644
--- a/src/lte/model/a3-rsrp-handover-algorithm.h
+++ b/src/lte/model/a3-rsrp-handover-algorithm.h
@@ -110,6 +110,6 @@ class A3RsrpHandoverAlgorithm : public LteHandoverAlgorithm
     LteHandoverManagementSapProvider* m_handoverManagementSapProvider;
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* A3_RSRP_HANDOVER_ALGORITHM_H */
diff --git a/src/lte/model/ff-mac-csched-sap.h b/src/lte/model/ff-mac-csched-sap.h
index 73a7e037f..ce79ac016 100644
--- a/src/lte/model/ff-mac-csched-sap.h
+++ b/src/lte/model/ff-mac-csched-sap.h
@@ -500,6 +500,6 @@ MemberCschedSapProvider<C>::CschedUeReleaseReq(const CschedUeReleaseReqParameter
     m_scheduler->DoCschedUeReleaseReq(params);
 }
 
-} // end namespace ns3
+} // namespace ns3
 
 #endif /* FF_MAC_CSCHED_SAP_H */
diff --git a/src/lte/model/lte-anr-sap.cc b/src/lte/model/lte-anr-sap.cc
index b0af2cad3..71a0743b9 100644
--- a/src/lte/model/lte-anr-sap.cc
+++ b/src/lte/model/lte-anr-sap.cc
@@ -20,4 +20,4 @@ LteAnrSapUser::~LteAnrSapUser()
 {
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-anr-sap.h b/src/lte/model/lte-anr-sap.h
index eae6856c0..897b23dae 100644
--- a/src/lte/model/lte-anr-sap.h
+++ b/src/lte/model/lte-anr-sap.h
@@ -216,6 +216,6 @@ MemberLteAnrSapUser<C>::AddUeMeasReportConfigForAnr(LteRrcSap::ReportConfigEutra
     return m_owner->DoAddUeMeasReportConfigForAnr(reportConfig);
 }
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_ANR_SAP_H */
diff --git a/src/lte/model/lte-anr.cc b/src/lte/model/lte-anr.cc
index da9ab205e..278a7bb91 100644
--- a/src/lte/model/lte-anr.cc
+++ b/src/lte/model/lte-anr.cc
@@ -233,4 +233,4 @@ LteAnr::Find(uint16_t cellId) const
     return &(it->second);
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-anr.h b/src/lte/model/lte-anr.h
index bf0d045d0..4ea1d0ee1 100644
--- a/src/lte/model/lte-anr.h
+++ b/src/lte/model/lte-anr.h
@@ -223,6 +223,6 @@ class LteAnr : public Object
     uint16_t m_servingCellId;
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_ANR_H */
diff --git a/src/lte/model/lte-ccm-mac-sap.cc b/src/lte/model/lte-ccm-mac-sap.cc
index e510925c9..83cfd3983 100644
--- a/src/lte/model/lte-ccm-mac-sap.cc
+++ b/src/lte/model/lte-ccm-mac-sap.cc
@@ -20,4 +20,4 @@ LteCcmMacSapUser::~LteCcmMacSapUser()
 {
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-ccm-mac-sap.h b/src/lte/model/lte-ccm-mac-sap.h
index a96e51660..ff8dee227 100644
--- a/src/lte/model/lte-ccm-mac-sap.h
+++ b/src/lte/model/lte-ccm-mac-sap.h
@@ -204,6 +204,6 @@ MemberLteCcmMacSapUser<C>::NotifyHarqDeliveryFailure()
     m_owner->DoNotifyHarqDeliveryFailure();
 }
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_CCM_MAC_SAP_H */
diff --git a/src/lte/model/lte-ccm-rrc-sap.cc b/src/lte/model/lte-ccm-rrc-sap.cc
index 37f570a8e..036f3e4d3 100644
--- a/src/lte/model/lte-ccm-rrc-sap.cc
+++ b/src/lte/model/lte-ccm-rrc-sap.cc
@@ -20,4 +20,4 @@ LteCcmRrcSapUser::~LteCcmRrcSapUser()
 {
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-ccm-rrc-sap.h b/src/lte/model/lte-ccm-rrc-sap.h
index c305b784e..7b60176d5 100644
--- a/src/lte/model/lte-ccm-rrc-sap.h
+++ b/src/lte/model/lte-ccm-rrc-sap.h
@@ -384,6 +384,6 @@ MemberLteCcmRrcSapUser<C>::SetNumberOfComponentCarriers(uint16_t noOfComponentCa
     return m_owner->DoSetNumberOfComponentCarriers(noOfComponentCarriers);
 }
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_CCM_RRC_SAP_H */
diff --git a/src/lte/model/lte-enb-component-carrier-manager.cc b/src/lte/model/lte-enb-component-carrier-manager.cc
index 5661134c7..0dc420708 100644
--- a/src/lte/model/lte-enb-component-carrier-manager.cc
+++ b/src/lte/model/lte-enb-component-carrier-manager.cc
@@ -121,4 +121,4 @@ LteEnbComponentCarrierManager::SetNumberOfComponentCarriers(uint16_t noOfCompone
     m_ccmRrcSapUser->SetNumberOfComponentCarriers(noOfComponentCarriers);
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-enb-component-carrier-manager.h b/src/lte/model/lte-enb-component-carrier-manager.h
index 2c07da711..ff42edabd 100644
--- a/src/lte/model/lte-enb-component-carrier-manager.h
+++ b/src/lte/model/lte-enb-component-carrier-manager.h
@@ -212,6 +212,6 @@ class LteEnbComponentCarrierManager : public Object
                              //!< calls from the eNodeB RRC instance.
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_ENB_COMPONENT_CARRIER_MANAGER_H */
diff --git a/src/lte/model/lte-enb-mac.h b/src/lte/model/lte-enb-mac.h
index a2f8d8969..86bc61d1b 100644
--- a/src/lte/model/lte-enb-mac.h
+++ b/src/lte/model/lte-enb-mac.h
@@ -454,6 +454,6 @@ class LteEnbMac : public Object
     uint8_t m_componentCarrierId;
 };
 
-} // end namespace ns3
+} // namespace ns3
 
 #endif /* LTE_ENB_MAC_ENTITY_H */
diff --git a/src/lte/model/lte-ffr-algorithm.cc b/src/lte/model/lte-ffr-algorithm.cc
index 5ff717fa4..416b91696 100644
--- a/src/lte/model/lte-ffr-algorithm.cc
+++ b/src/lte/model/lte-ffr-algorithm.cc
@@ -167,4 +167,4 @@ LteFfrAlgorithm::DoSetBandwidth(uint16_t ulBandwidth, uint16_t dlBandwidth)
     SetUlBandwidth(ulBandwidth);
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-ffr-algorithm.h b/src/lte/model/lte-ffr-algorithm.h
index 515e6b6eb..244b4c91c 100644
--- a/src/lte/model/lte-ffr-algorithm.h
+++ b/src/lte/model/lte-ffr-algorithm.h
@@ -245,6 +245,6 @@ class LteFfrAlgorithm : public Object
     bool m_needReconfiguration; /**< If true FR algorithm will be reconfigured*/
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_FFR_ALGORITHM_H */
diff --git a/src/lte/model/lte-ffr-distributed-algorithm.cc b/src/lte/model/lte-ffr-distributed-algorithm.cc
index 43a9dc3c9..43a53d298 100644
--- a/src/lte/model/lte-ffr-distributed-algorithm.cc
+++ b/src/lte/model/lte-ffr-distributed-algorithm.cc
@@ -703,4 +703,4 @@ LteFfrDistributedAlgorithm::UpdateNeighbourMeasurements(uint16_t rnti,
     }
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-ffr-distributed-algorithm.h b/src/lte/model/lte-ffr-distributed-algorithm.h
index e8d78d2f6..ed11f32cf 100644
--- a/src/lte/model/lte-ffr-distributed-algorithm.h
+++ b/src/lte/model/lte-ffr-distributed-algorithm.h
@@ -180,6 +180,6 @@ class LteFfrDistributedAlgorithm : public LteFfrAlgorithm
     std::map<uint16_t, std::vector<bool>> m_rntp; ///< RNTP
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_FR_DISTRIBUTED_ALGORITHM_H */
diff --git a/src/lte/model/lte-ffr-enhanced-algorithm.cc b/src/lte/model/lte-ffr-enhanced-algorithm.cc
index 3d74f3363..ab93a8496 100644
--- a/src/lte/model/lte-ffr-enhanced-algorithm.cc
+++ b/src/lte/model/lte-ffr-enhanced-algorithm.cc
@@ -927,4 +927,4 @@ LteFfrEnhancedAlgorithm::DoRecvLoadInformation(EpcX2Sap::LoadInformationParams p
     NS_LOG_WARN("Method should not be called, because it is empty");
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-ffr-enhanced-algorithm.h b/src/lte/model/lte-ffr-enhanced-algorithm.h
index 492e2f517..5d06688d3 100644
--- a/src/lte/model/lte-ffr-enhanced-algorithm.h
+++ b/src/lte/model/lte-ffr-enhanced-algorithm.h
@@ -183,6 +183,6 @@ class LteFfrEnhancedAlgorithm : public LteFfrAlgorithm
     uint8_t m_measId;
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_FFR_ENHANCED_ALGORITHM_H */
diff --git a/src/lte/model/lte-ffr-rrc-sap.h b/src/lte/model/lte-ffr-rrc-sap.h
index d4cc0ffa2..a16bfe14b 100644
--- a/src/lte/model/lte-ffr-rrc-sap.h
+++ b/src/lte/model/lte-ffr-rrc-sap.h
@@ -247,6 +247,6 @@ MemberLteFfrRrcSapUser<C>::SendLoadInformation(EpcX2Sap::LoadInformationParams p
     m_owner->DoSendLoadInformation(params);
 }
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_FFR_RRC_SAP_H */
diff --git a/src/lte/model/lte-ffr-sap.h b/src/lte/model/lte-ffr-sap.h
index 3a7019717..ffd3975ef 100644
--- a/src/lte/model/lte-ffr-sap.h
+++ b/src/lte/model/lte-ffr-sap.h
@@ -270,6 +270,6 @@ MemberLteFfrSapUser<C>::MemberLteFfrSapUser(C* owner)
 {
 }
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_FFR_SAP_H */
diff --git a/src/lte/model/lte-ffr-soft-algorithm.cc b/src/lte/model/lte-ffr-soft-algorithm.cc
index 6bd6ff5d5..c6d368ba7 100644
--- a/src/lte/model/lte-ffr-soft-algorithm.cc
+++ b/src/lte/model/lte-ffr-soft-algorithm.cc
@@ -704,4 +704,4 @@ LteFfrSoftAlgorithm::DoRecvLoadInformation(EpcX2Sap::LoadInformationParams param
     NS_LOG_WARN("Method should not be called, because it is empty");
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-ffr-soft-algorithm.h b/src/lte/model/lte-ffr-soft-algorithm.h
index f8d3cc8b7..94a721ded 100644
--- a/src/lte/model/lte-ffr-soft-algorithm.h
+++ b/src/lte/model/lte-ffr-soft-algorithm.h
@@ -153,6 +153,6 @@ class LteFfrSoftAlgorithm : public LteFfrAlgorithm
     uint8_t m_measId;
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_FFR_SOFT_ALGORITHM_H */
diff --git a/src/lte/model/lte-fr-hard-algorithm.cc b/src/lte/model/lte-fr-hard-algorithm.cc
index 33b9fc9f0..966fd85f9 100644
--- a/src/lte/model/lte-fr-hard-algorithm.cc
+++ b/src/lte/model/lte-fr-hard-algorithm.cc
@@ -380,4 +380,4 @@ LteFrHardAlgorithm::DoRecvLoadInformation(EpcX2Sap::LoadInformationParams params
     NS_LOG_WARN("Method should not be called, because it is empty");
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-fr-hard-algorithm.h b/src/lte/model/lte-fr-hard-algorithm.h
index 1c2df2fab..26cf735f6 100644
--- a/src/lte/model/lte-fr-hard-algorithm.h
+++ b/src/lte/model/lte-fr-hard-algorithm.h
@@ -115,6 +115,6 @@ class LteFrHardAlgorithm : public LteFfrAlgorithm
     std::vector<bool> m_ulRbgMap; ///< UL RBG Map
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_FR_HARD_ALGORITHM_H */
diff --git a/src/lte/model/lte-fr-no-op-algorithm.cc b/src/lte/model/lte-fr-no-op-algorithm.cc
index 7ed45c8f2..3a4754ae0 100644
--- a/src/lte/model/lte-fr-no-op-algorithm.cc
+++ b/src/lte/model/lte-fr-no-op-algorithm.cc
@@ -176,4 +176,4 @@ LteFrNoOpAlgorithm::DoRecvLoadInformation(EpcX2Sap::LoadInformationParams params
     NS_LOG_WARN("Method should not be called, because it is empty");
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-fr-no-op-algorithm.h b/src/lte/model/lte-fr-no-op-algorithm.h
index 852914d97..bbe97aed7 100644
--- a/src/lte/model/lte-fr-no-op-algorithm.h
+++ b/src/lte/model/lte-fr-no-op-algorithm.h
@@ -89,6 +89,6 @@ class LteFrNoOpAlgorithm : public LteFfrAlgorithm
     LteFfrRrcSapProvider* m_ffrRrcSapProvider; ///< FFR RRC SAP provider
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_FFR_NO_OP_ALGORITHM_H */
diff --git a/src/lte/model/lte-fr-soft-algorithm.cc b/src/lte/model/lte-fr-soft-algorithm.cc
index 70cfab282..92eca2173 100644
--- a/src/lte/model/lte-fr-soft-algorithm.cc
+++ b/src/lte/model/lte-fr-soft-algorithm.cc
@@ -566,4 +566,4 @@ LteFrSoftAlgorithm::DoRecvLoadInformation(EpcX2Sap::LoadInformationParams params
     NS_LOG_WARN("Method should not be called, because it is empty");
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-fr-soft-algorithm.h b/src/lte/model/lte-fr-soft-algorithm.h
index 44db8c884..bcc405d59 100644
--- a/src/lte/model/lte-fr-soft-algorithm.h
+++ b/src/lte/model/lte-fr-soft-algorithm.h
@@ -144,6 +144,6 @@ class LteFrSoftAlgorithm : public LteFfrAlgorithm
     uint8_t m_measId;
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_FR_SOFT_ALGORITHM_H */
diff --git a/src/lte/model/lte-fr-strict-algorithm.cc b/src/lte/model/lte-fr-strict-algorithm.cc
index ef18b34dd..e7818acf3 100644
--- a/src/lte/model/lte-fr-strict-algorithm.cc
+++ b/src/lte/model/lte-fr-strict-algorithm.cc
@@ -578,4 +578,4 @@ LteFrStrictAlgorithm::DoRecvLoadInformation(EpcX2Sap::LoadInformationParams para
     NS_LOG_WARN("Method should not be called, since it is empty");
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-fr-strict-algorithm.h b/src/lte/model/lte-fr-strict-algorithm.h
index 74f2b80ea..bb3af651f 100644
--- a/src/lte/model/lte-fr-strict-algorithm.h
+++ b/src/lte/model/lte-fr-strict-algorithm.h
@@ -144,6 +144,6 @@ class LteFrStrictAlgorithm : public LteFfrAlgorithm
     uint8_t m_measId;
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_FR_STRICT_ALGORITHM_H */
diff --git a/src/lte/model/lte-handover-algorithm.cc b/src/lte/model/lte-handover-algorithm.cc
index 524817fbb..3e8d2273e 100644
--- a/src/lte/model/lte-handover-algorithm.cc
+++ b/src/lte/model/lte-handover-algorithm.cc
@@ -38,4 +38,4 @@ LteHandoverAlgorithm::DoDispose()
 {
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-handover-algorithm.h b/src/lte/model/lte-handover-algorithm.h
index cb93c05d8..bb6929570 100644
--- a/src/lte/model/lte-handover-algorithm.h
+++ b/src/lte/model/lte-handover-algorithm.h
@@ -93,6 +93,6 @@ class LteHandoverAlgorithm : public Object
     virtual void DoReportUeMeas(uint16_t rnti, LteRrcSap::MeasResults measResults) = 0;
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_HANDOVER_ALGORITHM_H */
diff --git a/src/lte/model/lte-handover-management-sap.cc b/src/lte/model/lte-handover-management-sap.cc
index 77fcdfd41..6eb074c85 100644
--- a/src/lte/model/lte-handover-management-sap.cc
+++ b/src/lte/model/lte-handover-management-sap.cc
@@ -20,4 +20,4 @@ LteHandoverManagementSapUser::~LteHandoverManagementSapUser()
 {
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-handover-management-sap.h b/src/lte/model/lte-handover-management-sap.h
index bca704f91..1e7f16b3c 100644
--- a/src/lte/model/lte-handover-management-sap.h
+++ b/src/lte/model/lte-handover-management-sap.h
@@ -184,6 +184,6 @@ MemberLteHandoverManagementSapUser<C>::TriggerHandover(uint16_t rnti, uint16_t t
     return m_owner->DoTriggerHandover(rnti, targetCellId);
 }
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_HANDOVER_MANAGEMENT_SAP_H */
diff --git a/src/lte/model/lte-ue-ccm-rrc-sap.cc b/src/lte/model/lte-ue-ccm-rrc-sap.cc
index f98322629..604602cb3 100644
--- a/src/lte/model/lte-ue-ccm-rrc-sap.cc
+++ b/src/lte/model/lte-ue-ccm-rrc-sap.cc
@@ -20,4 +20,4 @@ LteUeCcmRrcSapUser::~LteUeCcmRrcSapUser()
 {
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-ue-ccm-rrc-sap.h b/src/lte/model/lte-ue-ccm-rrc-sap.h
index 761596721..f4a0bf590 100644
--- a/src/lte/model/lte-ue-ccm-rrc-sap.h
+++ b/src/lte/model/lte-ue-ccm-rrc-sap.h
@@ -235,6 +235,6 @@ MemberLteUeCcmRrcSapUser<C>::SetNumberOfComponentCarriers(uint16_t noOfComponent
     m_owner->DoSetNumberOfComponentCarriers(noOfComponentCarriers);
 }
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_UE_CCM_RRC_SAP_H */
diff --git a/src/lte/model/lte-ue-component-carrier-manager.cc b/src/lte/model/lte-ue-component-carrier-manager.cc
index e99160403..9be86f94d 100644
--- a/src/lte/model/lte-ue-component-carrier-manager.cc
+++ b/src/lte/model/lte-ue-component-carrier-manager.cc
@@ -96,4 +96,4 @@ LteUeComponentCarrierManager::SetNumberOfComponentCarriers(uint8_t noOfComponent
     m_ccmRrcSapUser->SetNumberOfComponentCarriers(noOfComponentCarriers);
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/lte-ue-component-carrier-manager.h b/src/lte/model/lte-ue-component-carrier-manager.h
index d6b8198ee..01283912f 100644
--- a/src/lte/model/lte-ue-component-carrier-manager.h
+++ b/src/lte/model/lte-ue-component-carrier-manager.h
@@ -97,6 +97,6 @@ class LteUeComponentCarrierManager : public Object
                               //!< flows of this UE.
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_UE_COMPONENT_CARRIER_MANAGER_H */
diff --git a/src/lte/model/no-op-component-carrier-manager.cc b/src/lte/model/no-op-component-carrier-manager.cc
index c7282ff0a..93b977b43 100644
--- a/src/lte/model/no-op-component-carrier-manager.cc
+++ b/src/lte/model/no-op-component-carrier-manager.cc
@@ -478,4 +478,4 @@ RrComponentCarrierManager::DoUlReceiveSr(uint16_t rnti, uint8_t /* componentCarr
     }
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/no-op-component-carrier-manager.h b/src/lte/model/no-op-component-carrier-manager.h
index ed87d3862..1f6b2f288 100644
--- a/src/lte/model/no-op-component-carrier-manager.h
+++ b/src/lte/model/no-op-component-carrier-manager.h
@@ -180,6 +180,6 @@ class RrComponentCarrierManager : public NoOpComponentCarrierManager
     // end of class RrComponentCarrierManager
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* NO_OP_COMPONENT_CARRIER_MANAGER_H */
diff --git a/src/lte/model/no-op-handover-algorithm.cc b/src/lte/model/no-op-handover-algorithm.cc
index 6609a782a..fbe6f3a18 100644
--- a/src/lte/model/no-op-handover-algorithm.cc
+++ b/src/lte/model/no-op-handover-algorithm.cc
@@ -75,4 +75,4 @@ NoOpHandoverAlgorithm::DoReportUeMeas(uint16_t rnti, LteRrcSap::MeasResults meas
     NS_LOG_FUNCTION(this << rnti << (uint16_t)measResults.measId);
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/no-op-handover-algorithm.h b/src/lte/model/no-op-handover-algorithm.h
index ef4771980..5ec286099 100644
--- a/src/lte/model/no-op-handover-algorithm.h
+++ b/src/lte/model/no-op-handover-algorithm.h
@@ -62,6 +62,6 @@ class NoOpHandoverAlgorithm : public LteHandoverAlgorithm
     LteHandoverManagementSapProvider* m_handoverManagementSapProvider;
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* NO_OP_HANDOVER_ALGORITHM_H */
diff --git a/src/lte/model/simple-ue-component-carrier-manager.cc b/src/lte/model/simple-ue-component-carrier-manager.cc
index 9a0023b7b..ec90a4d9a 100644
--- a/src/lte/model/simple-ue-component-carrier-manager.cc
+++ b/src/lte/model/simple-ue-component-carrier-manager.cc
@@ -368,4 +368,4 @@ SimpleUeComponentCarrierManager::DoConfigureSignalBearer(
     return m_ccmMacSapUser;
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/model/simple-ue-component-carrier-manager.h b/src/lte/model/simple-ue-component-carrier-manager.h
index 9bf5a8d66..e179ebdee 100644
--- a/src/lte/model/simple-ue-component-carrier-manager.h
+++ b/src/lte/model/simple-ue-component-carrier-manager.h
@@ -130,6 +130,6 @@ class SimpleUeComponentCarrierManager : public LteUeComponentCarrierManager
     LteMacSapProvider* m_ccmMacSapProvider; //!< Receive API calls from the UE RLC instance
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* SIMPLE_UE_COMPONENT_CARRIER_MANAGER_H */
diff --git a/src/lte/test/lte-ffr-simple.cc b/src/lte/test/lte-ffr-simple.cc
index b13969724..d7ebc44b1 100644
--- a/src/lte/test/lte-ffr-simple.cc
+++ b/src/lte/test/lte-ffr-simple.cc
@@ -306,4 +306,4 @@ LteFfrSimple::DoRecvLoadInformation(EpcX2Sap::LoadInformationParams params)
     NS_LOG_FUNCTION(this);
 }
 
-} // end of namespace ns3
+} // namespace ns3
diff --git a/src/lte/test/lte-ffr-simple.h b/src/lte/test/lte-ffr-simple.h
index 86e6aa60c..1834e86bf 100644
--- a/src/lte/test/lte-ffr-simple.h
+++ b/src/lte/test/lte-ffr-simple.h
@@ -147,6 +147,6 @@ class LteFfrSimple : public LteFfrAlgorithm
     bool m_accumulatedMode; ///< whether to use the TPC accumulated mode
 };
 
-} // end of namespace ns3
+} // namespace ns3
 
 #endif /* LTE_FFR_SIMPLE_H */
diff --git a/src/propagation/model/channel-condition-model.cc b/src/propagation/model/channel-condition-model.cc
index 274e09d00..1e3f1dd01 100644
--- a/src/propagation/model/channel-condition-model.cc
+++ b/src/propagation/model/channel-condition-model.cc
@@ -983,4 +983,4 @@ ThreeGppNTNRuralChannelConditionModel::ComputePlos(Ptr<const MobilityModel> a,
     return SuburbanRuralLOSProb.at(quantizedElevAngle);
 }
 
-} // end namespace ns3
+} // namespace ns3
diff --git a/src/propagation/model/probabilistic-v2v-channel-condition-model.cc b/src/propagation/model/probabilistic-v2v-channel-condition-model.cc
index db339c74d..eb7a8b68d 100644
--- a/src/propagation/model/probabilistic-v2v-channel-condition-model.cc
+++ b/src/propagation/model/probabilistic-v2v-channel-condition-model.cc
@@ -228,4 +228,4 @@ ProbabilisticV2vHighwayChannelConditionModel::ComputePnlos(Ptr<const MobilityMod
     return pNlos;
 }
 
-} // end namespace ns3
+} // namespace ns3
diff --git a/src/uan/helper/uan-helper.cc b/src/uan/helper/uan-helper.cc
index cb518cff7..fa7d53bc7 100644
--- a/src/uan/helper/uan-helper.cc
+++ b/src/uan/helper/uan-helper.cc
@@ -195,4 +195,4 @@ UanHelper::AssignStreams(NetDeviceContainer c, int64_t stream)
     return (currentStream - stream);
 }
 
-} // end namespace ns3
+} // namespace ns3
diff --git a/src/uan/helper/uan-helper.h b/src/uan/helper/uan-helper.h
index 79e1d4375..1d4726b09 100644
--- a/src/uan/helper/uan-helper.h
+++ b/src/uan/helper/uan-helper.h
@@ -202,6 +202,6 @@ UanHelper::SetTransducer(std::string type, Ts&&... args)
     m_transducer = ObjectFactory(type, std::forward<Ts>(args)...);
 }
 
-} // end namespace ns3
+} // namespace ns3
 
 #endif /* UAN_HELPER_H */