diff --git a/misc/config_tools/board_inspector/acpiparser/aml/parser.py b/misc/config_tools/board_inspector/acpiparser/aml/parser.py
index d122537c7..9ee5505b2 100644
--- a/misc/config_tools/board_inspector/acpiparser/aml/parser.py
+++ b/misc/config_tools/board_inspector/acpiparser/aml/parser.py
@@ -588,10 +588,18 @@ def DefOpRegion_hook_named(context, tree, name):
 def DefPowerRes_hook_named(context, tree, name):
     sym = NamedDecl(name, tree)
     context.register_symbol(sym)
+    context.change_scope(name)
+
+def DefPowerRes_hook_post(context, tree):
+    context.pop_scope()
 
 def DefThermalZone_hook_named(context, tree, name):
     sym = NamedDecl(name, tree)
     context.register_symbol(sym)
+    context.change_scope(name)
+
+def DefThermalZone_hook_post(context, tree):
+    context.pop_scope()
 
 ################################################################################
 # Instantiate parsers