diff --git a/src/applications/model/three-gpp-http-client.cc b/src/applications/model/three-gpp-http-client.cc
index fefc6c25d..1d8bd04e9 100644
--- a/src/applications/model/three-gpp-http-client.cc
+++ b/src/applications/model/three-gpp-http-client.cc
@@ -59,6 +59,7 @@ ThreeGppHttpClient::GetTypeId()
                 PointerValue(),
                 MakePointerAccessor(&ThreeGppHttpClient::m_httpVariables),
                 MakePointerChecker<ThreeGppHttpVariables>())
+            // NS_DEPRECATED_3_44
             .AddAttribute("RemoteServerAddress",
                           "The address of the destination server.",
                           AddressValue(),
@@ -66,6 +67,7 @@ ThreeGppHttpClient::GetTypeId()
                           MakeAddressChecker(),
                           TypeId::SupportLevel::DEPRECATED,
                           "Replaced by Remote in ns-3.44.")
+            // NS_DEPRECATED_3_44
             .AddAttribute("RemoteServerPort",
                           "The destination port of the outbound packets.",
                           UintegerValue(80), // the default HTTP port
diff --git a/src/applications/model/three-gpp-http-server.cc b/src/applications/model/three-gpp-http-server.cc
index bdf431d5c..ba6eef382 100644
--- a/src/applications/model/three-gpp-http-server.cc
+++ b/src/applications/model/three-gpp-http-server.cc
@@ -59,6 +59,7 @@ ThreeGppHttpServer::GetTypeId()
                           PointerValue(),
                           MakePointerAccessor(&ThreeGppHttpServer::m_httpVariables),
                           MakePointerChecker<ThreeGppHttpVariables>())
+            // NS_DEPRECATED_3_44
             .AddAttribute("LocalAddress",
                           "The local address of the server, "
                           "i.e., the address on which to bind the Rx socket.",
@@ -67,6 +68,7 @@ ThreeGppHttpServer::GetTypeId()
                           MakeAddressChecker(),
                           TypeId::SupportLevel::DEPRECATED,
                           "Replaced by Local in ns-3.44.")
+            // NS_DEPRECATED_3_44
             .AddAttribute("LocalPort",
                           "Port on which the application listen for incoming packets.",
                           UintegerValue(80), // the default HTTP port
diff --git a/src/applications/model/udp-client.cc b/src/applications/model/udp-client.cc
index f190d66bc..f21e7dab4 100644
--- a/src/applications/model/udp-client.cc
+++ b/src/applications/model/udp-client.cc
@@ -49,6 +49,7 @@ UdpClient::GetTypeId()
                           TimeValue(Seconds(1)),
                           MakeTimeAccessor(&UdpClient::m_interval),
                           MakeTimeChecker())
+            // NS_DEPRECATED_3_44
             .AddAttribute("RemoteAddress",
                           "The destination Address of the outbound packets",
                           AddressValue(),
@@ -60,6 +61,7 @@ UdpClient::GetTypeId()
                           MakeAddressChecker(),
                           TypeId::SupportLevel::DEPRECATED,
                           "Replaced by Remote in ns-3.44.")
+            // NS_DEPRECATED_3_44
             .AddAttribute("RemotePort",
                           "The destination port of the outbound packets",
                           UintegerValue(UdpClient::DEFAULT_PORT),
diff --git a/src/applications/model/udp-echo-client.cc b/src/applications/model/udp-echo-client.cc
index 4cec49c1a..c2e0808a4 100644
--- a/src/applications/model/udp-echo-client.cc
+++ b/src/applications/model/udp-echo-client.cc
@@ -41,6 +41,7 @@ UdpEchoClient::GetTypeId()
                           TimeValue(Seconds(1)),
                           MakeTimeAccessor(&UdpEchoClient::m_interval),
                           MakeTimeChecker())
+            // NS_DEPRECATED_3_44
             .AddAttribute(
                 "RemoteAddress",
                 "The destination Address of the outbound packets",
@@ -53,6 +54,7 @@ UdpEchoClient::GetTypeId()
                 MakeAddressChecker(),
                 TypeId::SupportLevel::DEPRECATED,
                 "Replaced by Remote in ns-3.44.")
+            // NS_DEPRECATED_3_44
             .AddAttribute("RemotePort",
                           "The destination port of the outbound packets",
                           UintegerValue(UdpEchoClient::DEFAULT_PORT),
diff --git a/src/applications/model/udp-trace-client.cc b/src/applications/model/udp-trace-client.cc
index 24dabbe09..c644b1c95 100644
--- a/src/applications/model/udp-trace-client.cc
+++ b/src/applications/model/udp-trace-client.cc
@@ -56,6 +56,7 @@ UdpTraceClient::GetTypeId()
             .SetParent<SourceApplication>()
             .SetGroupName("Applications")
             .AddConstructor<UdpTraceClient>()
+            // NS_DEPRECATED_3_44
             .AddAttribute("RemoteAddress",
                           "The destination Address of the outbound packets",
                           AddressValue(),
@@ -66,6 +67,7 @@ UdpTraceClient::GetTypeId()
                           MakeAddressChecker(),
                           TypeId::SupportLevel::DEPRECATED,
                           "Replaced by Remote in ns-3.44.")
+            // NS_DEPRECATED_3_44
             .AddAttribute(
                 "RemotePort",
                 "The destination port of the outbound packets",
diff --git a/src/config-store/model/config-store.cc b/src/config-store/model/config-store.cc
index 7da8966f0..f6627ba67 100644
--- a/src/config-store/model/config-store.cc
+++ b/src/config-store/model/config-store.cc
@@ -61,6 +61,7 @@ ConfigStore::GetTypeId()
                 EnumValue(ConfigStore::RAW_TEXT),
                 MakeEnumAccessor<FileFormat>(&ConfigStore::SetFileFormat),
                 MakeEnumChecker(ConfigStore::RAW_TEXT, "RawText", ConfigStore::XML, "Xml"))
+            // NS_DEPRECATED_3_43
             .AddAttribute(
                 "SaveDeprecated",
                 "Save DEPRECATED attributes",
diff --git a/src/wifi/model/txop.cc b/src/wifi/model/txop.cc
index e6360f034..e081b36f3 100644
--- a/src/wifi/model/txop.cc
+++ b/src/wifi/model/txop.cc
@@ -65,6 +65,7 @@ Txop::GetTypeId()
                                           "AC_BEACON",
                                           AC_UNDEF,
                                           "AC_UNDEF"))
+            // NS_DEPRECATED_3_42
             .AddAttribute("MinCw",
                           "The minimum value of the contention window (just for the first link, "
                           "in case of 11be multi-link devices).",
@@ -85,6 +86,7 @@ Txop::GetTypeId()
                 AttributeContainerValue<UintegerValue>(),
                 MakeAttributeContainerAccessor<UintegerValue>(&Txop::SetMinCws, &Txop::GetMinCws),
                 MakeAttributeContainerChecker<UintegerValue>(MakeUintegerChecker<uint32_t>()))
+            // NS_DEPRECATED_3_42
             .AddAttribute("MaxCw",
                           "The maximum value of the contention window (just for the first link, "
                           "in case of 11be multi-link devices).",
@@ -105,6 +107,7 @@ Txop::GetTypeId()
                 AttributeContainerValue<UintegerValue>(),
                 MakeAttributeContainerAccessor<UintegerValue>(&Txop::SetMaxCws, &Txop::GetMaxCws),
                 MakeAttributeContainerChecker<UintegerValue>(MakeUintegerChecker<uint32_t>()))
+            // NS_DEPRECATED_3_42
             .AddAttribute(
                 "Aifsn",
                 "The AIFSN: the default value conforms to non-QOS (just for the first link, "
@@ -126,6 +129,7 @@ Txop::GetTypeId()
                 AttributeContainerValue<UintegerValue>(),
                 MakeAttributeContainerAccessor<UintegerValue>(&Txop::SetAifsns, &Txop::GetAifsns),
                 MakeAttributeContainerChecker<UintegerValue>(MakeUintegerChecker<uint8_t>()))
+            // NS_DEPRECATED_3_42
             .AddAttribute("TxopLimit",
                           "The TXOP limit: the default value conforms to non-QoS "
                           "(just for the first link, in case of 11be multi-link devices).",
diff --git a/src/wifi/model/wifi-remote-station-manager.cc b/src/wifi/model/wifi-remote-station-manager.cc
index 1f5d7f75b..e532d80f3 100644
--- a/src/wifi/model/wifi-remote-station-manager.cc
+++ b/src/wifi/model/wifi-remote-station-manager.cc
@@ -45,6 +45,7 @@ WifiRemoteStationManager::GetTypeId()
         TypeId("ns3::WifiRemoteStationManager")
             .SetParent<Object>()
             .SetGroupName("Wifi")
+            // NS_DEPRECATED_3_44
             .AddAttribute("MaxSsrc",
                           "The maximum number of retransmission attempts for any packet with size "
                           "<= RtsCtsThreshold. "
@@ -54,6 +55,7 @@ WifiRemoteStationManager::GetTypeId()
                           MakeUintegerChecker<uint32_t>(),
                           TypeId::SupportLevel::OBSOLETE,
                           "Use WifiMac::FrameRetryLimit instead")
+            // NS_DEPRECATED_3_44
             .AddAttribute("MaxSlrc",
                           "The maximum number of retransmission attempts for any packet with size "
                           "> RtsCtsThreshold. "