diff --git a/.clang-tidy b/.clang-tidy
index 4c9cefe6626..735513ee34c 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -433,8 +433,8 @@ CheckOptions:
     value: lower_case
   - key: readability-identifier-naming.ClassCase
     value: CamelCase
-  - key: readability-identifier-naming.PrivateMemberPrefix
-    value: ""
+  - key: readability-identifier-naming.PrivateMemberSuffix
+    value: _
   - key: readability-identifier-naming.StructCase
     value: CamelCase
   - key: readability-identifier-naming.FunctionCase
@@ -442,7 +442,11 @@ CheckOptions:
   - key: readability-identifier-naming.VariableCase
     value: lower_case
   - key: readability-identifier-naming.GlobalConstantCase
-    value: UPPER_CASE
+    value: lower_case
+  - key: readability-identifier-naming.GlobalConstantPrefix
+    value: g_
+  - key: readability-identifier-naming.ConstexprVariableCase
+    value: lower_case
   - key: readability-inconsistent-declaration-parameter-name.IgnoreMacros
     value: "1"
   - key: readability-inconsistent-declaration-parameter-name.Strict