diff --git a/etc/cmake/options.cmake b/etc/cmake/options.cmake
index a4fbc359c..4df97cd41 100644
--- a/etc/cmake/options.cmake
+++ b/etc/cmake/options.cmake
@@ -102,7 +102,7 @@ ot_option(OT_DHCP6_SERVER OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE "DHCP6 server")
 ot_option(OT_DIAGNOSTIC OPENTHREAD_CONFIG_DIAG_ENABLE "diagnostic")
 ot_option(OT_DNS_CLIENT OPENTHREAD_CONFIG_DNS_CLIENT_ENABLE "DNS client")
 ot_option(OT_DNS_DSO OPENTHREAD_CONFIG_DNS_DSO_ENABLE "DNS Stateful Operations (DSO)")
-ot_option(OT_DNS_QUERY_UPSTREAM OPENTHREAD_CONFIG_DNS_UPSTREAM_QUERY_ENABLE "Allow sending DNS queries to upstream")
+ot_option(OT_DNS_UPSTREAM_QUERY OPENTHREAD_CONFIG_DNS_UPSTREAM_QUERY_ENABLE "Allow sending DNS queries to upstream")
 ot_option(OT_DNSSD_SERVER OPENTHREAD_CONFIG_DNSSD_SERVER_ENABLE "DNS-SD server")
 ot_option(OT_DUA OPENTHREAD_CONFIG_DUA_ENABLE "Domain Unicast Address (DUA)")
 ot_option(OT_ECDSA OPENTHREAD_CONFIG_ECDSA_ENABLE "ECDSA")
diff --git a/examples/README.md b/examples/README.md
index a6d282320..45d4815f3 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -34,7 +34,7 @@ This page lists the available common switches with description. Unless stated ot
 | DEBUG_UART_LOG | not implemented | Enables the log output for the debug UART. Requires OPENTHREAD_CONFIG_ENABLE_DEBUG_UART to be enabled. |
 | DNS_CLIENT | OT_DNS_CLIENT | Enables support for DNS client. Enable this switch on a device that sends a DNS query for AAAA (IPv6) record. |
 | DNS_DSO | OT_DNS_DSO | Enables support for DNS Stateful Operations (DSO). |
-| DNS_QUERY_UPSTREAM | OT_DNS_QUERY_UPSTREAM | Enables forwarding DNS queries to upstream DNS server. |
+| DNS_UPSTREAM_QUERY | OT_DNS_UPSTREAM_QUERY | Enables forwarding DNS queries to upstream DNS server. |
 | DNSSD_SERVER | OT_DNSSD_SERVER | Enables support for DNS-SD server. DNS-SD server use service information from local SRP server to resolve DNS-SD query questions. |
 | DUA | OT_DUA | Enables the Domain Unicast Address feature for Thread 1.2. |
 | DYNAMIC_LOG_LEVEL | not implemented | Enables the dynamic log level feature. Enable this switch if OpenThread log level is required to be set at runtime. See [Logging guide](https://openthread.io/guides/build/logs) to learn more. |
diff --git a/examples/common-switches.mk b/examples/common-switches.mk
index 0fd0418fb..afd676f36 100644
--- a/examples/common-switches.mk
+++ b/examples/common-switches.mk
@@ -51,7 +51,7 @@ DISABLE_DOC               ?= 0
 DISABLE_TOOLS             ?= 0
 DNS_CLIENT                ?= 0
 DNS_DSO                   ?= 0
-DNS_QUERY_UPSTREAM        ?= 0
+DNS_UPSTREAM_QUERY        ?= 0
 DNSSD_SERVER              ?= 0
 DUA                       ?= 0
 DYNAMIC_LOG_LEVEL         ?= 0
@@ -209,7 +209,7 @@ ifeq ($(DNS_DSO),1)
 COMMONCFLAGS                   += -DOPENTHREAD_CONFIG_DNS_DSO_ENABLE=1
 endif
 
-ifeq ($(DNS_QUERY_UPSTREAM), 1)
+ifeq ($(DNS_UPSTREAM_QUERY), 1)
 COMMONCFLAGS                   += -DOPENTHREAD_CONFIG_DNS_UPSTREAM_QUERY_ENABLE=1
 endif
 
diff --git a/script/make-pretty b/script/make-pretty
index 475122e07..443ac5321 100755
--- a/script/make-pretty
+++ b/script/make-pretty
@@ -107,7 +107,7 @@ OT_CLANG_TIDY_BUILD_OPTS=(
     '-DOT_DIAGNOSTIC=ON'
     '-DOT_DNS_CLIENT=ON'
     '-DOT_DNS_DSO=ON'
-    '-DOT_DNS_QUERY_UPSTREAM=ON'
+    '-DOT_DNS_UPSTREAM_QUERY=ON'
     '-DOT_DNSSD_SERVER=ON'
     '-DOT_DUA=ON'
     '-DOT_MLR=ON'