diff --git a/src/wifi/CMakeLists.txt b/src/wifi/CMakeLists.txt
index a5f0fa250..ed5849b64 100644
--- a/src/wifi/CMakeLists.txt
+++ b/src/wifi/CMakeLists.txt
@@ -137,7 +137,6 @@ set(source_files
     model/wifi-acknowledgment.cc
     model/wifi-assoc-manager.cc
     model/wifi-bandwidth-filter.cc
-    model/wifi-constants.cc
     model/wifi-default-ack-manager.cc
     model/wifi-default-assoc-manager.cc
     model/wifi-default-gcr-manager.cc
@@ -167,6 +166,7 @@ set(source_files
     model/wifi-ru.cc
     model/wifi-spectrum-phy-interface.cc
     model/wifi-spectrum-signal-parameters.cc
+    model/wifi-standard-constants.cc
     model/wifi-standards.cc
     model/wifi-tx-current-model.cc
     model/wifi-tx-parameters.cc
@@ -311,7 +311,6 @@ set(header_files
     model/wifi-acknowledgment.h
     model/wifi-assoc-manager.h
     model/wifi-bandwidth-filter.h
-    model/wifi-constants.h
     model/wifi-default-ack-manager.h
     model/wifi-default-assoc-manager.h
     model/wifi-default-gcr-manager.h
@@ -329,6 +328,7 @@ set(header_files
     model/wifi-mode.h
     model/wifi-mpdu.h
     model/wifi-net-device.h
+    model/wifi-ns3-constants.h
     model/wifi-opt-field.h
     model/wifi-phy-band.h
     model/wifi-phy-common.h
@@ -347,6 +347,7 @@ set(header_files
     model/wifi-ru.h
     model/wifi-spectrum-phy-interface.h
     model/wifi-spectrum-signal-parameters.h
+    model/wifi-standard-constants.h
     model/wifi-standards.h
     model/wifi-tx-current-model.h
     model/wifi-tx-parameters.h
diff --git a/src/wifi/model/tim.cc b/src/wifi/model/tim.cc
index 82d6e3b7c..24194a540 100644
--- a/src/wifi/model/tim.cc
+++ b/src/wifi/model/tim.cc
@@ -8,7 +8,7 @@
 
 #include "tim.h"
 
-#include "wifi-constants.h"
+#include "wifi-standard-constants.h"
 
 #include <algorithm>
 #include <cstdint>
diff --git a/src/wifi/model/wifi-mac-trailer.h b/src/wifi/model/wifi-mac-trailer.h
index a003cdc99..e32345d04 100644
--- a/src/wifi/model/wifi-mac-trailer.h
+++ b/src/wifi/model/wifi-mac-trailer.h
@@ -9,7 +9,7 @@
 #ifndef WIFI_MAC_TRAILER_H
 #define WIFI_MAC_TRAILER_H
 
-#include "wifi-constants.h"
+#include "wifi-standard-constants.h"
 
 #include "ns3/trailer.h"
 
diff --git a/src/wifi/model/wifi-mode.h b/src/wifi/model/wifi-mode.h
index bece1dd62..58ec9af08 100644
--- a/src/wifi/model/wifi-mode.h
+++ b/src/wifi/model/wifi-mode.h
@@ -10,8 +10,8 @@
 #ifndef WIFI_MODE_H
 #define WIFI_MODE_H
 
-#include "wifi-constants.h"
 #include "wifi-phy-common.h"
+#include "wifi-standard-constants.h"
 
 #include "ns3/attribute-helper.h"
 #include "ns3/callback.h"
diff --git a/src/wifi/model/wifi-ns3-constants.h b/src/wifi/model/wifi-ns3-constants.h
new file mode 100644
index 000000000..529e423df
--- /dev/null
+++ b/src/wifi/model/wifi-ns3-constants.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2025
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * Author: Sharan Naribole <sharan.naribole@gmail.com>
+ */
+
+#ifndef WIFI_NS3_CONSTANTS_H
+#define WIFI_NS3_CONSTANTS_H
+
+/**
+ * @file
+ * @ingroup wifi
+ * Declaration of default values used across wifi module
+ */
+
+namespace ns3
+{
+
+/// UL MU Data Disable flag at non-AP STA
+static constexpr bool DEFAULT_WIFI_UL_MU_DATA_DISABLE{false};
+
+/// UL MU Data Disable Rx support at AP
+static constexpr bool DEFAULT_WIFI_UL_MU_DATA_DISABLE_RX{true};
+
+} // namespace ns3
+
+#endif /* WIFI_NS3_CONSTANTS_H */
diff --git a/src/wifi/model/wifi-constants.cc b/src/wifi/model/wifi-standard-constants.cc
similarity index 95%
rename from src/wifi/model/wifi-constants.cc
rename to src/wifi/model/wifi-standard-constants.cc
index a1b816f7e..3fb3172a2 100644
--- a/src/wifi/model/wifi-constants.cc
+++ b/src/wifi/model/wifi-standard-constants.cc
@@ -6,7 +6,7 @@
  * Author: Sébastien Deronne <sebastien.deronne@gmail.com>
  */
 
-#include "wifi-constants.h"
+#include "wifi-standard-constants.h"
 
 namespace ns3
 {
diff --git a/src/wifi/model/wifi-constants.h b/src/wifi/model/wifi-standard-constants.h
similarity index 97%
rename from src/wifi/model/wifi-constants.h
rename to src/wifi/model/wifi-standard-constants.h
index f238df0e9..09dca7498 100644
--- a/src/wifi/model/wifi-constants.h
+++ b/src/wifi/model/wifi-standard-constants.h
@@ -6,8 +6,8 @@
  * Author: Sébastien Deronne <sebastien.deronne@gmail.com>
  */
 
-#ifndef WIFI_CONSTANTS_H
-#define WIFI_CONSTANTS_H
+#ifndef WIFI_STANDARD_CONSTANTS_H
+#define WIFI_STANDARD_CONSTANTS_H
 
 #include "ns3/nstime.h"
 #include "ns3/wifi-export.h"
@@ -128,4 +128,4 @@ static constexpr uint16_t AID_SPECIAL_USER{2007};
 
 } // namespace ns3
 
-#endif /* WIFI_CONSTANTS_H */
+#endif /* WIFI_STANDARD_CONSTANTS_H */
diff --git a/src/wifi/model/wifi-utils.h b/src/wifi/model/wifi-utils.h
index c84be1117..7b766a42c 100644
--- a/src/wifi/model/wifi-utils.h
+++ b/src/wifi/model/wifi-utils.h
@@ -10,7 +10,7 @@
 #define WIFI_UTILS_H
 
 #include "block-ack-type.h"
-#include "wifi-constants.h"
+#include "wifi-standard-constants.h"
 #include "wifi-types.h"
 
 #include "ns3/fatal-error.h"
@@ -66,8 +66,14 @@ operator<<(std::ostream& os, const WifiDirection& direction)
     }
 }
 
+/// @brief IEEE 802.11-2020 9.2.4.5.2 TID subfield
+using tid_t = uint8_t;
+
+/// @brief IEEE 802.11be D7.0 Figure 9-207e—Link ID Info field format
+using linkId_t = uint8_t;
+
 /// @brief TID-indexed map of the link set to which the TID is mapped
-using WifiTidLinkMapping = std::map<uint8_t, std::set<uint8_t>>;
+using WifiTidLinkMapping = std::map<tid_t, std::set<linkId_t>>;
 
 /**
  * Convert from dBm to Watts.