diff --git a/examples/apps/windows/otAdapter.h b/examples/apps/windows/otAdapter.h
index b23ec1d69..49081822b 100644
--- a/examples/apps/windows/otAdapter.h
+++ b/examples/apps/windows/otAdapter.h
@@ -519,62 +519,62 @@ private:
         IInspectable* pInspectable = (IInspectable*)aContext;
         otAdapter^ pThis = reinterpret_cast<otAdapter^>(pInspectable);
 
-        if (aFlags & OT_IP6_ADDRESS_ADDED)
+        if (aFlags & OT_CHANGED_IP6_ADDRESS_ADDED)
         {
             pThis->IpAddressAdded(pThis);
         }
 
-        if (aFlags & OT_IP6_ADDRESS_REMOVED)
+        if (aFlags & OT_CHANGED_IP6_ADDRESS_REMOVED)
         {
             pThis->IpAddressRemoved(pThis);
         }
 
-        if (aFlags & OT_IP6_RLOC_ADDED)
+        if (aFlags & OT_CHANGED_THREAD_RLOC_ADDED)
         {
             pThis->IpRlocAdded(pThis);
         }
 
-        if (aFlags & OT_IP6_RLOC_REMOVED)
+        if (aFlags & OT_CHANGED_THREAD_RLOC_REMOVED)
         {
             pThis->IpRlocRemoved(pThis);
         }
 
-        if (aFlags & OT_IP6_LL_ADDR_CHANGED)
+        if (aFlags & OT_CHANGED_THREAD_LL_ADDR)
         {
             pThis->IpLinkLocalAddresChanged(pThis);
         }
 
-        if (aFlags & OT_IP6_ML_ADDR_CHANGED)
+        if (aFlags & OT_CHANGED_THREAD_ML_ADDR)
         {
             pThis->IpMeshLocalAddresChanged(pThis);
         }
 
-        if (aFlags & OT_NET_ROLE)
+        if (aFlags & OT_CHANGED_THREAD_ROLE)
         {
             pThis->NetRoleChanged(pThis);
         }
 
-        if (aFlags & OT_NET_PARTITION_ID)
+        if (aFlags & OT_CHANGED_THREAD_PARTITION_ID)
         {
             pThis->NetPartitionIdChanged(pThis);
         }
 
-        if (aFlags & OT_NET_KEY_SEQUENCE_COUNTER)
+        if (aFlags & OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER)
         {
             pThis->NetKeySequenceCounterChanged(pThis);
         }
 
-        if (aFlags & OT_THREAD_CHILD_ADDED)
+        if (aFlags & OT_CHANGED_THREAD_CHILD_ADDED)
         {
             pThis->ThreadChildAdded(pThis);
         }
 
-        if (aFlags & OT_THREAD_CHILD_REMOVED)
+        if (aFlags & OT_CHANGED_THREAD_CHILD_REMOVED)
         {
             pThis->ThreadChildRemoved(pThis);
         }
 
-        if (aFlags & OT_THREAD_NETDATA_UPDATED)
+        if (aFlags & OT_CHANGED_THREAD_NETDATA)
         {
             pThis->ThreadNetDataUpdated(pThis);
         }
diff --git a/examples/drivers/windows/otLwf/address.c b/examples/drivers/windows/otLwf/address.c
index f591fc1e3..98abaa13b 100644
--- a/examples/drivers/windows/otLwf/address.c
+++ b/examples/drivers/windows/otLwf/address.c
@@ -479,7 +479,7 @@ otLwfTunAddressesUpdated(
                 {
                     memcpy_s(&addr.mAddress, sizeof(addr.mAddress), pAddr, sizeof(IN6_ADDR));
                     otLwfOnAddressAdded(pFilter, &addr, TRUE);
-                    *aNotifFlags |= OT_IP6_ADDRESS_ADDED;
+                    *aNotifFlags |= OT_CHANGED_IP6_ADDRESS_ADDED;
                 }
                 else
                 {
@@ -499,7 +499,7 @@ otLwfTunAddressesUpdated(
         if ((FoundInOpenThread & (1 << i)) == 0)
         {
             otLwfOnAddressRemoved(pFilter, (ULONG)i, TRUE);
-            *aNotifFlags |= OT_IP6_ADDRESS_REMOVED;
+            *aNotifFlags |= OT_CHANGED_IP6_ADDRESS_REMOVED;
         }
     }
     
diff --git a/examples/drivers/windows/otLwf/thread.c b/examples/drivers/windows/otLwf/thread.c
index b070cb686..2139f456f 100644
--- a/examples/drivers/windows/otLwf/thread.c
+++ b/examples/drivers/windows/otLwf/thread.c
@@ -489,59 +489,59 @@ void otLwfStateChangedCallback(uint32_t aFlags, _In_ void *aContext)
     // Process the notification internally
     //
 
-    if ((aFlags & OT_IP6_ADDRESS_ADDED) != 0)
+    if ((aFlags & OT_CHANGED_IP6_ADDRESS_ADDED) != 0)
     {
-        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_IP6_ADDRESS_ADDED", pFilter);
+        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_IP6_ADDRESS_ADDED", pFilter);
         otLwfRadioAddressesUpdated(pFilter);
     }
 
-    if ((aFlags & OT_IP6_ADDRESS_REMOVED) != 0)
+    if ((aFlags & OT_CHANGED_IP6_ADDRESS_REMOVED) != 0)
     {
-        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_IP6_ADDRESS_REMOVED", pFilter);
+        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_IP6_ADDRESS_REMOVED", pFilter);
         otLwfRadioAddressesUpdated(pFilter);
     }
 
-    if ((aFlags & OT_IP6_RLOC_ADDED) != 0)
+    if ((aFlags & OT_CHANGED_THREAD_RLOC_ADDED) != 0)
     {
-        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_IP6_RLOC_ADDED", pFilter);
+        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_RLOC_ADDED", pFilter);
         otLwfRadioAddressesUpdated(pFilter);
     }
 
-    if ((aFlags & OT_IP6_RLOC_REMOVED) != 0)
+    if ((aFlags & OT_CHANGED_THREAD_RLOC_REMOVED) != 0)
     {
-        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_IP6_RLOC_REMOVED", pFilter);
+        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_RLOC_REMOVED", pFilter);
         otLwfRadioAddressesUpdated(pFilter);
     }
 
-    if ((aFlags & OT_NET_ROLE) != 0)
+    if ((aFlags & OT_CHANGED_THREAD_ROLE) != 0)
     {
-        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_NET_ROLE", pFilter);
+        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_ROLE", pFilter);
         otLwfProcessRoleStateChange(pFilter);
     }
 
-    if ((aFlags & OT_NET_PARTITION_ID) != 0)
+    if ((aFlags & OT_CHANGED_THREAD_PARTITION_ID) != 0)
     {
-        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_NET_PARTITION_ID", pFilter);
+        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_PARTITION_ID", pFilter);
     }
 
-    if ((aFlags & OT_NET_KEY_SEQUENCE_COUNTER) != 0)
+    if ((aFlags & OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER) != 0)
     {
-        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_NET_KEY_SEQUENCE_COUNTER", pFilter);
+        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER", pFilter);
     }
 
-    if ((aFlags & OT_THREAD_CHILD_ADDED) != 0)
+    if ((aFlags & OT_CHANGED_THREAD_CHILD_ADDED) != 0)
     {
-        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_THREAD_CHILD_ADDED", pFilter);
+        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_CHILD_ADDED", pFilter);
     }
 
-    if ((aFlags & OT_THREAD_CHILD_REMOVED) != 0)
+    if ((aFlags & OT_CHANGED_THREAD_CHILD_REMOVED) != 0)
     {
-        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_THREAD_CHILD_REMOVED", pFilter);
+        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_CHILD_REMOVED", pFilter);
     }
 
-    if ((aFlags & OT_THREAD_NETDATA_UPDATED) != 0)
+    if ((aFlags & OT_CHANGED_THREAD_NETDATA) != 0)
     {
-        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_THREAD_NETDATA_UPDATED", pFilter);
+        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_NETDATA", pFilter);
         otIp6SlaacUpdate(pFilter->otCtx, pFilter->otAutoAddresses, ARRAYSIZE(pFilter->otAutoAddresses), otIp6CreateRandomIid, NULL);
 
 #if OPENTHREAD_ENABLE_DHCP6_SERVER
@@ -553,9 +553,9 @@ void otLwfStateChangedCallback(uint32_t aFlags, _In_ void *aContext)
 #endif  // OPENTHREAD_ENABLE_DHCP6_CLIENT
     }
 
-    if ((aFlags & OT_IP6_ML_ADDR_CHANGED) != 0)
+    if ((aFlags & OT_CHANGED_THREAD_ML_ADDR) != 0)
     {
-        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_IP6_ML_ADDR_CHANGED", pFilter);
+        LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_ML_ADDR", pFilter);
     }
     
     //
diff --git a/examples/drivers/windows/otLwf/tunnel.c b/examples/drivers/windows/otLwf/tunnel.c
index 47eeb5719..770f635ae 100644
--- a/examples/drivers/windows/otLwf/tunnel.c
+++ b/examples/drivers/windows/otLwf/tunnel.c
@@ -450,27 +450,27 @@ otLwfTunValueIs(
             MediaConnectStateDisconnected);
 
         // Set flag to indicate we should send a notification
-        aNotifFlags = OT_NET_ROLE;
+        aNotifFlags = OT_CHANGED_THREAD_ROLE;
     }
     else if (key == SPINEL_PROP_IPV6_LL_ADDR)
     {
         // Set flag to indicate we should send a notification
-        aNotifFlags = OT_IP6_LL_ADDR_CHANGED;
+        aNotifFlags = OT_CHANGED_THREAD_LL_ADDR;
     }
     else if (key == SPINEL_PROP_IPV6_ML_ADDR)
     {
         // Set flag to indicate we should send a notification
-        aNotifFlags = OT_IP6_ML_ADDR_CHANGED;
+        aNotifFlags = OT_CHANGED_THREAD_ML_ADDR;
     }
     else if (key == SPINEL_PROP_NET_PARTITION_ID)
     {
         // Set flag to indicate we should send a notification
-        aNotifFlags = OT_NET_PARTITION_ID;
+        aNotifFlags = OT_CHANGED_THREAD_PARTITION_ID;
     }
     else if (key == SPINEL_PROP_NET_KEY_SEQUENCE_COUNTER)
     {
         // Set flag to indicate we should send a notification
-        aNotifFlags = OT_NET_KEY_SEQUENCE_COUNTER;
+        aNotifFlags = OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER;
     }
     else if (key == SPINEL_PROP_IPV6_ADDRESS_TABLE)
     {
@@ -486,7 +486,7 @@ otLwfTunValueIs(
         // TODO - Slaac
 
         // Set flag to indicate we should send a notification
-        aNotifFlags = OT_THREAD_NETDATA_UPDATED;
+        aNotifFlags = OT_CHANGED_THREAD_NETDATA;
     }
     else if ((key == SPINEL_PROP_STREAM_NET) || (key == SPINEL_PROP_STREAM_NET_INSECURE))
     {
diff --git a/examples/drivers/windows/otNodeApi/otNodeApi.cpp b/examples/drivers/windows/otNodeApi/otNodeApi.cpp
index 4dfa64ad5..381412d09 100644
--- a/examples/drivers/windows/otNodeApi/otNodeApi.cpp
+++ b/examples/drivers/windows/otNodeApi/otNodeApi.cpp
@@ -707,14 +707,14 @@ void OTCALL otNodeStateChangedCallback(uint32_t aFlags, void *aContext)
     otLogFuncEntry();
     otNode* aNode = (otNode*)aContext;
 
-    if ((aFlags & OT_NET_ROLE) != 0)
+    if ((aFlags & OT_CHANGED_THREAD_ROLE) != 0)
     {
         auto Role = otThreadGetDeviceRole(aNode->mInstance);
         printf("%d: new role: %s\r\n", aNode->mId, otDeviceRoleToString(Role));
     }
 
-    if ((aFlags & OT_IP6_ADDRESS_ADDED) != 0 || (aFlags & OT_IP6_ADDRESS_REMOVED) != 0 ||
-        (aFlags & OT_IP6_RLOC_ADDED) != 0 || (aFlags & OT_IP6_RLOC_REMOVED) != 0)
+    if ((aFlags & OT_CHANGED_IP6_ADDRESS_ADDED) != 0 || (aFlags & OT_CHANGED_IP6_ADDRESS_REMOVED) != 0 ||
+        (aFlags & OT_CHANGED_THREAD_RLOC_ADDED) != 0 || (aFlags & OT_CHANGED_THREAD_RLOC_REMOVED) != 0)
     {
         HandleAddressChanges(aNode);
     }
diff --git a/include/openthread/types.h b/include/openthread/types.h
index 7b7b20151..40f4b65cd 100644
--- a/include/openthread/types.h
+++ b/include/openthread/types.h
@@ -637,22 +637,18 @@ typedef struct otLinkModeConfig
  */
 enum
 {
-    OT_IP6_ADDRESS_ADDED         = 1 << 0,  ///< IPv6 address was added
-    OT_IP6_ADDRESS_REMOVED       = 1 << 1,  ///< IPv6 address was removed
-
-    OT_NET_ROLE                  = 1 << 3,  ///< Device role (disabled, detached, child, router, leader) changed
-    OT_NET_PARTITION_ID          = 1 << 4,  ///< Partition ID changed
-    OT_NET_KEY_SEQUENCE_COUNTER  = 1 << 5,  ///< Thread Key Sequence changed
-
-    OT_THREAD_CHILD_ADDED        = 1 << 6,  ///< Child was added
-    OT_THREAD_CHILD_REMOVED      = 1 << 7,  ///< Child was removed
-    OT_THREAD_NETDATA_UPDATED    = 1 << 8,  ///< Thread Network Data updated
-
-    OT_IP6_LL_ADDR_CHANGED       = 1 << 9,  ///< The link-local address has changed
-    OT_IP6_ML_ADDR_CHANGED       = 1 << 10, ///< The mesh-local address has changed
-
-    OT_IP6_RLOC_ADDED            = 1 << 11, ///< RLOC was added
-    OT_IP6_RLOC_REMOVED          = 1 << 12, ///< RLOC was removed
+    OT_CHANGED_IP6_ADDRESS_ADDED            = 1 << 0,   ///< IPv6 address was added
+    OT_CHANGED_IP6_ADDRESS_REMOVED          = 1 << 1,   ///< IPv6 address was removed
+    OT_CHANGED_THREAD_ROLE                  = 1 << 2,   ///< Role (disabled, detached, child, router, leader) changed
+    OT_CHANGED_THREAD_LL_ADDR               = 1 << 3,   ///< The link-local address changed
+    OT_CHANGED_THREAD_ML_ADDR               = 1 << 4,   ///< The mesh-local address changed
+    OT_CHANGED_THREAD_RLOC_ADDED            = 1 << 5,   ///< RLOC was added
+    OT_CHANGED_THREAD_RLOC_REMOVED          = 1 << 6,   ///< RLOC was removed
+    OT_CHANGED_THREAD_PARTITION_ID          = 1 << 7,   ///< Partition ID changed
+    OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER  = 1 << 8,   ///< Thread Key Sequence changed
+    OT_CHANGED_THREAD_NETDATA               = 1 << 9,   ///< Thread Network Data changed
+    OT_CHANGED_THREAD_CHILD_ADDED           = 1 << 10,  ///< Child was added
+    OT_CHANGED_THREAD_CHILD_REMOVED         = 1 << 11,  ///< Child was removed
 };
 
 /**
diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp
index 869361a49..98e1a21b3 100644
--- a/src/cli/cli.cpp
+++ b/src/cli/cli.cpp
@@ -3055,7 +3055,7 @@ void Interpreter::HandleNetifStateChanged(otInstance *mInstance, uint32_t aFlags
 void Interpreter::HandleNetifStateChanged(uint32_t aFlags)
 #endif
 {
-    VerifyOrExit((aFlags & OT_THREAD_NETDATA_UPDATED) != 0);
+    VerifyOrExit((aFlags & OT_CHANGED_THREAD_NETDATA) != 0);
 
 #ifndef OTDLL
     otIp6SlaacUpdate(mInstance, mSlaacAddresses, sizeof(mSlaacAddresses) / sizeof(mSlaacAddresses[0]),
diff --git a/src/core/meshcop/joiner_router.cpp b/src/core/meshcop/joiner_router.cpp
index b281d6bd9..e168c4a0d 100644
--- a/src/core/meshcop/joiner_router.cpp
+++ b/src/core/meshcop/joiner_router.cpp
@@ -88,7 +88,7 @@ void JoinerRouter::HandleNetifStateChanged(uint32_t aFlags, void *aContext)
 void JoinerRouter::HandleNetifStateChanged(uint32_t aFlags)
 {
     VerifyOrExit(mNetif.GetMle().GetDeviceMode() & Mle::ModeTlv::kModeFFD);
-    VerifyOrExit(aFlags & OT_THREAD_NETDATA_UPDATED);
+    VerifyOrExit(aFlags & OT_CHANGED_THREAD_NETDATA);
 
     mNetif.GetIp6Filter().RemoveUnsecurePort(mSocket.GetSockName().mPort);
 
@@ -149,7 +149,7 @@ otError JoinerRouter::SetJoinerUdpPort(uint16_t aJoinerUdpPort)
     otLogFuncEntry();
     mJoinerUdpPort = aJoinerUdpPort;
     mIsJoinerPortConfigured = true;
-    HandleNetifStateChanged(OT_THREAD_NETDATA_UPDATED);
+    HandleNetifStateChanged(OT_CHANGED_THREAD_NETDATA);
     otLogFuncExit();
     return OT_ERROR_NONE;
 }
diff --git a/src/core/net/netif.cpp b/src/core/net/netif.cpp
index fa935e8af..9aaf84516 100644
--- a/src/core/net/netif.cpp
+++ b/src/core/net/netif.cpp
@@ -290,7 +290,7 @@ otError Netif::AddUnicastAddress(NetifUnicastAddress &aAddress)
     aAddress.mNext = mUnicastAddresses;
     mUnicastAddresses = &aAddress;
 
-    SetStateChangedFlags(aAddress.mRloc ? OT_IP6_RLOC_ADDED : OT_IP6_ADDRESS_ADDED);
+    SetStateChangedFlags(aAddress.mRloc ? OT_CHANGED_THREAD_RLOC_ADDED : OT_CHANGED_IP6_ADDRESS_ADDED);
 
 exit:
     return error;
@@ -323,7 +323,7 @@ exit:
 
     if (error != OT_ERROR_NOT_FOUND)
     {
-        SetStateChangedFlags(aAddress.mRloc ? OT_IP6_RLOC_REMOVED : OT_IP6_ADDRESS_REMOVED);
+        SetStateChangedFlags(aAddress.mRloc ? OT_CHANGED_THREAD_RLOC_REMOVED : OT_CHANGED_IP6_ADDRESS_REMOVED);
     }
 
     return error;
@@ -366,7 +366,7 @@ otError Netif::AddExternalUnicastAddress(const NetifUnicastAddress &aAddress)
     entry->mNext = mUnicastAddresses;
     mUnicastAddresses = entry;
 
-    SetStateChangedFlags(OT_IP6_ADDRESS_ADDED);
+    SetStateChangedFlags(OT_CHANGED_IP6_ADDRESS_ADDED);
 
 exit:
     return error;
@@ -406,7 +406,7 @@ otError Netif::RemoveExternalUnicastAddress(const Address &aAddress)
     // To mark the address entry as unused/available, set the `mNext` pointer back to the entry itself.
     entry->mNext = entry;
 
-    SetStateChangedFlags(OT_IP6_ADDRESS_REMOVED);
+    SetStateChangedFlags(OT_CHANGED_IP6_ADDRESS_REMOVED);
 
 exit:
     return error;
diff --git a/src/core/thread/energy_scan_server.cpp b/src/core/thread/energy_scan_server.cpp
index b22baacb6..04ece8ff7 100644
--- a/src/core/thread/energy_scan_server.cpp
+++ b/src/core/thread/energy_scan_server.cpp
@@ -242,7 +242,7 @@ void EnergyScanServer::HandleNetifStateChanged(uint32_t aFlags, void *aContext)
 
 void EnergyScanServer::HandleNetifStateChanged(uint32_t aFlags)
 {
-    if ((aFlags & OT_THREAD_NETDATA_UPDATED) != 0 &&
+    if ((aFlags & OT_CHANGED_THREAD_NETDATA) != 0 &&
         !mActive &&
         mNetif.GetNetworkDataLeader().GetCommissioningData() == NULL)
     {
diff --git a/src/core/thread/key_manager.cpp b/src/core/thread/key_manager.cpp
index 15ca4d0eb..c962a91d4 100644
--- a/src/core/thread/key_manager.cpp
+++ b/src/core/thread/key_manager.cpp
@@ -136,7 +136,7 @@ otError KeyManager::SetMasterKey(const otMasterKey &aKey)
         children[i].SetMleFrameCounter(0);
     }
 
-    mNetif.SetStateChangedFlags(OT_NET_KEY_SEQUENCE_COUNTER);
+    mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER);
 
 exit:
     return error;
@@ -207,7 +207,7 @@ void KeyManager::SetCurrentKeySequence(uint32_t aKeySequence)
         mKeyRotationTimer.Start(Timer::HoursToMsec(mKeyRotationTime));
     }
 
-    mNetif.SetStateChangedFlags(OT_NET_KEY_SEQUENCE_COUNTER);
+    mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER);
 
 exit:
     return;
diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp
index eec27fc96..27adea147 100644
--- a/src/core/thread/mle.cpp
+++ b/src/core/thread/mle.cpp
@@ -220,7 +220,7 @@ otError Mle::Start(bool aEnableReattach, bool aAnnounceAttach)
     VerifyOrExit(mNetif.IsUp(), error = OT_ERROR_INVALID_STATE);
 
     mRole = OT_DEVICE_ROLE_DETACHED;
-    mNetif.SetStateChangedFlags(OT_NET_ROLE);
+    mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_ROLE);
     SetStateDetached();
 
     mNetif.GetKeyManager().Start();
@@ -554,7 +554,7 @@ otError Mle::SetStateDetached(void)
 {
     if (mRole != OT_DEVICE_ROLE_DETACHED)
     {
-        mNetif.SetStateChangedFlags(OT_NET_ROLE);
+        mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_ROLE);
     }
 
     if (mRole == OT_DEVICE_ROLE_LEADER)
@@ -579,7 +579,7 @@ otError Mle::SetStateChild(uint16_t aRloc16)
 {
     if (mRole != OT_DEVICE_ROLE_CHILD)
     {
-        mNetif.SetStateChangedFlags(OT_NET_ROLE);
+        mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_ROLE);
     }
 
     if (mRole == OT_DEVICE_ROLE_LEADER)
@@ -690,7 +690,7 @@ otError Mle::UpdateLinkLocalAddress(void)
     mLinkLocal64.GetAddress().SetIid(*mNetif.GetMac().GetExtAddress());
     mNetif.AddUnicastAddress(mLinkLocal64);
 
-    mNetif.SetStateChangedFlags(OT_IP6_LL_ADDR_CHANGED);
+    mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_LL_ADDR);
 
     return OT_ERROR_NONE;
 }
@@ -736,7 +736,7 @@ otError Mle::SetMeshLocalPrefix(const uint8_t *aMeshLocalPrefix)
     }
 
     // Changing the prefix also causes the mesh local address to be different.
-    mNetif.SetStateChangedFlags(OT_IP6_ML_ADDR_CHANGED);
+    mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_ML_ADDR);
 
 exit:
     return OT_ERROR_NONE;
@@ -783,7 +783,7 @@ void Mle::SetLeaderData(uint32_t aPartitionId, uint8_t aWeighting, uint8_t aLead
 {
     if (mLeaderData.GetPartitionId() != aPartitionId)
     {
-        mNetif.SetStateChangedFlags(OT_NET_PARTITION_ID);
+        mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_PARTITION_ID);
     }
 
     mLeaderData.SetPartitionId(aPartitionId);
@@ -1237,7 +1237,7 @@ void Mle::HandleNetifStateChanged(uint32_t aFlags)
 {
     VerifyOrExit(mRole != OT_DEVICE_ROLE_DISABLED);
 
-    if ((aFlags & (OT_IP6_ADDRESS_ADDED | OT_IP6_ADDRESS_REMOVED)) != 0)
+    if ((aFlags & (OT_CHANGED_IP6_ADDRESS_ADDED | OT_CHANGED_IP6_ADDRESS_REMOVED)) != 0)
     {
         if (!mNetif.IsUnicastAddress(mMeshLocal64.GetAddress()))
         {
@@ -1248,7 +1248,7 @@ void Mle::HandleNetifStateChanged(uint32_t aFlags)
             }
 
             mNetif.AddUnicastAddress(mMeshLocal64);
-            mNetif.SetStateChangedFlags(OT_IP6_ML_ADDR_CHANGED);
+            mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_ML_ADDR);
         }
 
         if (mRole == OT_DEVICE_ROLE_CHILD && (mDeviceMode & ModeTlv::kModeFFD) == 0)
@@ -1257,13 +1257,13 @@ void Mle::HandleNetifStateChanged(uint32_t aFlags)
         }
     }
 
-    if ((aFlags & OT_THREAD_NETDATA_UPDATED) != 0)
+    if ((aFlags & OT_CHANGED_THREAD_NETDATA) != 0)
     {
         if (mDeviceMode & ModeTlv::kModeFFD)
         {
             mNetif.GetMle().HandleNetworkDataUpdateRouter();
         }
-        else if ((aFlags & OT_NET_ROLE) == 0)
+        else if ((aFlags & OT_CHANGED_THREAD_ROLE) == 0)
         {
             mSendChildUpdateRequest.Post();
         }
@@ -1273,7 +1273,7 @@ void Mle::HandleNetifStateChanged(uint32_t aFlags)
 #endif
     }
 
-    if (aFlags & (OT_NET_ROLE | OT_NET_KEY_SEQUENCE_COUNTER))
+    if (aFlags & (OT_CHANGED_THREAD_ROLE | OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER))
     {
         Store();
     }
diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp
index e2143fbd3..b69a56d86 100644
--- a/src/core/thread/mle_router.cpp
+++ b/src/core/thread/mle_router.cpp
@@ -419,7 +419,7 @@ otError MleRouter::SetStateRouter(uint16_t aRloc16)
 {
     if (mRole != OT_DEVICE_ROLE_ROUTER)
     {
-        mNetif.SetStateChangedFlags(OT_NET_ROLE);
+        mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_ROLE);
     }
 
     SetRloc16(aRloc16);
@@ -454,7 +454,7 @@ otError MleRouter::SetStateLeader(uint16_t aRloc16)
 {
     if (mRole != OT_DEVICE_ROLE_LEADER)
     {
-        mNetif.SetStateChangedFlags(OT_NET_ROLE);
+        mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_ROLE);
     }
 
     SetRloc16(aRloc16);
@@ -3117,7 +3117,7 @@ otError MleRouter::RemoveNeighbor(Neighbor &aNeighbor)
         {
             aNeighbor.SetState(Neighbor::kStateInvalid);
             mNetif.GetMeshForwarder().UpdateIndirectMessages();
-            mNetif.SetStateChangedFlags(OT_THREAD_CHILD_REMOVED);
+            mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_CHILD_REMOVED);
             mNetif.GetNetworkDataLeader().SendServerDataNotification(aNeighbor.GetRloc16());
             RemoveStoredChild(aNeighbor.GetRloc16());
         }
@@ -4579,7 +4579,7 @@ void MleRouter::SetChildStateToValid(Child *aChild)
     VerifyOrExit(aChild->GetState() != Neighbor::kStateValid);
 
     aChild->SetState(Neighbor::kStateValid);
-    mNetif.SetStateChangedFlags(OT_THREAD_CHILD_ADDED);
+    mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_CHILD_ADDED);
     StoreChild(aChild->GetRloc16());
 
 exit:
@@ -4610,7 +4610,7 @@ void MleRouter::RemoveChildren(void)
         switch (mChildren[i].GetState())
         {
         case Neighbor::kStateValid:
-            mNetif.SetStateChangedFlags(OT_THREAD_CHILD_REMOVED);
+            mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_CHILD_REMOVED);
 
         // Fall-through to next case
 
diff --git a/src/core/thread/network_data_leader.cpp b/src/core/thread/network_data_leader.cpp
index 5468b8cb4..44e188a99 100644
--- a/src/core/thread/network_data_leader.cpp
+++ b/src/core/thread/network_data_leader.cpp
@@ -73,7 +73,7 @@ void LeaderBase::Reset(void)
     mVersion = static_cast<uint8_t>(otPlatRandomGet());
     mStableVersion = static_cast<uint8_t>(otPlatRandomGet());
     mLength = 0;
-    mNetif.SetStateChangedFlags(OT_THREAD_NETDATA_UPDATED);
+    mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_NETDATA);
 }
 
 otError LeaderBase::GetContext(const Ip6::Address &aAddress, Lowpan::Context &aContext)
@@ -423,7 +423,7 @@ void LeaderBase::SetNetworkData(uint8_t aVersion, uint8_t aStableVersion, bool a
 
     otDumpDebgNetData(GetInstance(), "set network data", mTlvs, mLength);
 
-    mNetif.SetStateChangedFlags(OT_THREAD_NETDATA_UPDATED);
+    mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_NETDATA);
 }
 
 otError LeaderBase::SetCommissioningData(const uint8_t *aValue, uint8_t aValueLength)
@@ -446,7 +446,7 @@ otError LeaderBase::SetCommissioningData(const uint8_t *aValue, uint8_t aValueLe
     }
 
     mVersion++;
-    mNetif.SetStateChangedFlags(OT_THREAD_NETDATA_UPDATED);
+    mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_NETDATA);
 
 exit:
     return error;
diff --git a/src/core/thread/network_data_leader_ftd.cpp b/src/core/thread/network_data_leader_ftd.cpp
index 96f596939..c0a767498 100644
--- a/src/core/thread/network_data_leader_ftd.cpp
+++ b/src/core/thread/network_data_leader_ftd.cpp
@@ -103,7 +103,7 @@ void Leader::IncrementVersion(void)
     if (mNetif.GetMle().GetRole() == OT_DEVICE_ROLE_LEADER)
     {
         mVersion++;
-        mNetif.SetStateChangedFlags(OT_THREAD_NETDATA_UPDATED);
+        mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_NETDATA);
     }
 }
 
@@ -142,7 +142,7 @@ void Leader::RemoveBorderRouter(uint16_t aRloc16)
         mStableVersion++;
     }
 
-    mNetif.SetStateChangedFlags(OT_THREAD_NETDATA_UPDATED);
+    mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_NETDATA);
 
 exit:
     return;
@@ -590,7 +590,7 @@ otError Leader::RegisterNetworkData(uint16_t aRloc16, uint8_t *aTlvs, uint8_t aT
         }
     }
 
-    mNetif.SetStateChangedFlags(OT_THREAD_NETDATA_UPDATED);
+    mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_NETDATA);
 
 exit:
     return error;
@@ -774,7 +774,7 @@ otError Leader::FreeContext(uint8_t aContextId)
     mContextUsed &= ~(1 << aContextId);
     mVersion++;
     mStableVersion++;
-    mNetif.SetStateChangedFlags(OT_THREAD_NETDATA_UPDATED);
+    mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_NETDATA);
     return OT_ERROR_NONE;
 }
 
diff --git a/src/ncp/ncp_base.cpp b/src/ncp/ncp_base.cpp
index aca465ad9..c0d9cfd3f 100644
--- a/src/ncp/ncp_base.cpp
+++ b/src/ncp/ncp_base.cpp
@@ -1140,7 +1140,7 @@ void NcpBase::UpdateChangedProps(void)
 
             mChangedFlags &= ~static_cast<uint32_t>(NCP_PLAT_RESET_REASON);
         }
-        else if ((mChangedFlags & OT_IP6_LL_ADDR_CHANGED) != 0)
+        else if ((mChangedFlags & OT_CHANGED_THREAD_LL_ADDR) != 0)
         {
             SuccessOrExit(
                 HandleCommandPropertyGet(
@@ -1148,9 +1148,9 @@ void NcpBase::UpdateChangedProps(void)
                     SPINEL_PROP_IPV6_LL_ADDR
                 ));
 
-            mChangedFlags &= ~static_cast<uint32_t>(OT_IP6_LL_ADDR_CHANGED);
+            mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_LL_ADDR);
         }
-        else if ((mChangedFlags & OT_IP6_ML_ADDR_CHANGED) != 0)
+        else if ((mChangedFlags & OT_CHANGED_THREAD_ML_ADDR) != 0)
         {
             SuccessOrExit(
                 HandleCommandPropertyGet(
@@ -1158,9 +1158,9 @@ void NcpBase::UpdateChangedProps(void)
                     SPINEL_PROP_IPV6_ML_ADDR
                 ));
 
-            mChangedFlags &= ~static_cast<uint32_t>(OT_IP6_ML_ADDR_CHANGED);
+            mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_ML_ADDR);
         }
-        else if ((mChangedFlags & OT_NET_ROLE) != 0)
+        else if ((mChangedFlags & OT_CHANGED_THREAD_ROLE) != 0)
         {
             if (mRequireJoinExistingNetwork)
             {
@@ -1182,7 +1182,7 @@ void NcpBase::UpdateChangedProps(void)
 #endif
                    )
                 {
-                    mChangedFlags &= ~static_cast<uint32_t>(OT_NET_PARTITION_ID);
+                    mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_PARTITION_ID);
                     otThreadSetEnabled(mInstance, false);
 
                     // TODO: It would be nice to be able to indicate
@@ -1216,9 +1216,9 @@ void NcpBase::UpdateChangedProps(void)
                     SPINEL_PROP_NET_ROLE
                 ));
 
-            mChangedFlags &= ~static_cast<uint32_t>(OT_NET_ROLE);
+            mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_ROLE);
         }
-        else if ((mChangedFlags & OT_NET_PARTITION_ID) != 0)
+        else if ((mChangedFlags & OT_CHANGED_THREAD_PARTITION_ID) != 0)
         {
             SuccessOrExit(
                 HandleCommandPropertyGet(
@@ -1226,9 +1226,9 @@ void NcpBase::UpdateChangedProps(void)
                     SPINEL_PROP_NET_PARTITION_ID
                 ));
 
-            mChangedFlags &= ~static_cast<uint32_t>(OT_NET_PARTITION_ID);
+            mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_PARTITION_ID);
         }
-        else if ((mChangedFlags & OT_NET_KEY_SEQUENCE_COUNTER) != 0)
+        else if ((mChangedFlags & OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER) != 0)
         {
             SuccessOrExit(
                 HandleCommandPropertyGet(
@@ -1236,9 +1236,9 @@ void NcpBase::UpdateChangedProps(void)
                     SPINEL_PROP_NET_KEY_SEQUENCE_COUNTER
                 ));
 
-            mChangedFlags &= ~static_cast<uint32_t>(OT_NET_KEY_SEQUENCE_COUNTER);
+            mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER);
         }
-        else if ((mChangedFlags & (OT_IP6_ADDRESS_ADDED | OT_IP6_ADDRESS_REMOVED)) != 0)
+        else if ((mChangedFlags & (OT_CHANGED_IP6_ADDRESS_ADDED | OT_CHANGED_IP6_ADDRESS_REMOVED)) != 0)
         {
             SuccessOrExit(
                 HandleCommandPropertyGet(
@@ -1246,9 +1246,9 @@ void NcpBase::UpdateChangedProps(void)
                     SPINEL_PROP_IPV6_ADDRESS_TABLE
                 ));
 
-            mChangedFlags &= ~static_cast<uint32_t>(OT_IP6_ADDRESS_ADDED | OT_IP6_ADDRESS_REMOVED);
+            mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_IP6_ADDRESS_ADDED | OT_CHANGED_IP6_ADDRESS_REMOVED);
         }
-        else if ((mChangedFlags & (OT_THREAD_CHILD_ADDED | OT_THREAD_CHILD_REMOVED)) != 0)
+        else if ((mChangedFlags & (OT_CHANGED_THREAD_CHILD_ADDED | OT_CHANGED_THREAD_CHILD_REMOVED)) != 0)
         {
             SuccessOrExit(
                 HandleCommandPropertyGet(
@@ -1256,9 +1256,9 @@ void NcpBase::UpdateChangedProps(void)
                     SPINEL_PROP_THREAD_CHILD_TABLE
                 ));
 
-            mChangedFlags &= ~static_cast<uint32_t>(OT_THREAD_CHILD_ADDED | OT_THREAD_CHILD_REMOVED);
+            mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_CHILD_ADDED | OT_CHANGED_THREAD_CHILD_REMOVED);
         }
-        else if ((mChangedFlags & OT_THREAD_NETDATA_UPDATED) != 0)
+        else if ((mChangedFlags & OT_CHANGED_THREAD_NETDATA) != 0)
         {
             SuccessOrExit(
                 HandleCommandPropertyGet(
@@ -1266,7 +1266,7 @@ void NcpBase::UpdateChangedProps(void)
                     SPINEL_PROP_THREAD_LEADER_NETWORK_DATA
                 ));
 
-            mChangedFlags &= ~static_cast<uint32_t>(OT_THREAD_NETDATA_UPDATED);
+            mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_NETDATA);
 
             // If the network data is updated, after successfully sending (or queuing) the
             // network data spinel message, we add `NCP_ON_MESH_NETS_CHANGED_BIT_FLAG` to
@@ -1284,9 +1284,9 @@ void NcpBase::UpdateChangedProps(void)
 
             mChangedFlags &= ~static_cast<uint32_t>(NCP_ON_MESH_NETS_CHANGED_BIT_FLAG);
         }
-        else if ((mChangedFlags & (OT_IP6_RLOC_ADDED | OT_IP6_RLOC_REMOVED)) != 0)
+        else if ((mChangedFlags & (OT_CHANGED_THREAD_RLOC_ADDED | OT_CHANGED_THREAD_RLOC_REMOVED)) != 0)
         {
-            mChangedFlags &= ~static_cast<uint32_t>(OT_IP6_RLOC_ADDED | OT_IP6_RLOC_REMOVED);
+            mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_RLOC_ADDED | OT_CHANGED_THREAD_RLOC_REMOVED);
         }
     }