diff --git a/misc/config_tools/board_inspector/acpiparser/aml/context.py b/misc/config_tools/board_inspector/acpiparser/aml/context.py
index 310a4af1a..eb467b3ae 100644
--- a/misc/config_tools/board_inspector/acpiparser/aml/context.py
+++ b/misc/config_tools/board_inspector/acpiparser/aml/context.py
@@ -233,10 +233,6 @@ class Context:
         else:
             raise InvalidPath(new_scope)
 
-    def enter_scope(self, name):
-        self.__scope_history.append(copy(self.__current_scope))
-        self.__current_scope.append(name)
-
     def pop_scope(self):
         assert(self.__scope_history)
         self.__current_scope = self.__scope_history.pop()
diff --git a/misc/config_tools/board_inspector/acpiparser/aml/parser.py b/misc/config_tools/board_inspector/acpiparser/aml/parser.py
index 301c92d16..bcc019910 100644
--- a/misc/config_tools/board_inspector/acpiparser/aml/parser.py
+++ b/misc/config_tools/board_inspector/acpiparser/aml/parser.py
@@ -491,7 +491,7 @@ def DefCreateWordField_hook_named(context, tree, name):
 def DefDevice_hook_named(context, tree, name):
     sym = DeviceDecl(name, tree)
     context.register_symbol(sym)
-    context.enter_scope(name)
+    context.change_scope(name)
 
 def DefDevice_hook_post(context, tree):
     context.pop_scope()