diff --git a/grammar.js b/grammar.js
index 5bd543ef3..1aa6647dd 100644
--- a/grammar.js
+++ b/grammar.js
@@ -24,7 +24,7 @@ module.exports = grammar(require('tree-sitter-typescript/typescript/grammar'), {
 
   conflicts: ($, original) => original.concat([
     [$.ui_property_modifier, $.ui_required],  // required property name vs required property
-    [$.ui_qualified_id, $.primary_expression],  // [Qualified.Obj {}] vs [member.expr]
+    [$.ui_nested_identifier, $.primary_expression],  // Nested.Obj {} vs member.expr
   ]),
 
   rules: {
@@ -266,7 +266,7 @@ module.exports = grammar(require('tree-sitter-typescript/typescript/grammar'), {
     // MemberExpression -> reparseAsQualifiedId()
     _ui_qualified_id: $ => choice(
       $._ui_identifier,
-      $.ui_qualified_id,
+      alias($.ui_nested_identifier, $.nested_identifier),
     ),
 
     _ui_identifier: $ => choice(
@@ -274,7 +274,7 @@ module.exports = grammar(require('tree-sitter-typescript/typescript/grammar'), {
       alias($._reserved_identifier, $.identifier),
     ),
 
-    ui_qualified_id: $ => seq(
+    ui_nested_identifier: $ => seq(
       $._ui_qualified_id,
       '.',
       $.identifier,
diff --git a/queries/highlights.scm b/queries/highlights.scm
index 64461e53e..a3a953f29 100644
--- a/queries/highlights.scm
+++ b/queries/highlights.scm
@@ -3,7 +3,7 @@
 (ui_binding
   name: (identifier) @property)
 (ui_binding
-  name: (ui_qualified_id
+  name: (nested_identifier
          (identifier) @property))
 
 (ui_property
diff --git a/test/corpus/declarative-ui.txt b/test/corpus/declarative-ui.txt
index 6818d6528..623bc7aa4 100644
--- a/test/corpus/declarative-ui.txt
+++ b/test/corpus/declarative-ui.txt
@@ -103,7 +103,7 @@ Item {
         type_name: (identifier)
         initializer: (ui_object_initializer))
       (ui_object_definition
-        type_name: (ui_qualified_id
+        type_name: (nested_identifier
           (identifier)
           (identifier))
         initializer: (ui_object_initializer)))))
@@ -128,10 +128,10 @@ MyItem {
         name: (identifier)
         initializer: (ui_object_initializer))
       (ui_object_definition_binding
-        type_name: (ui_qualified_id
+        type_name: (nested_identifier
           (identifier)
           (identifier))
-        name: (ui_qualified_id
+        name: (nested_identifier
           (identifier)
           (identifier))
         initializer: (ui_object_initializer)))))
@@ -184,7 +184,7 @@ MyItem {
         name: (identifier)
         value: (ui_object_array
           (ui_object_definition
-            type_name: (ui_qualified_id
+            type_name: (nested_identifier
               (identifier)
               (identifier))
             initializer: (ui_object_initializer))
@@ -199,7 +199,7 @@ MyItem {
       (ui_binding
         name: (identifier)
         value: (ui_object_definition
-          type_name: (ui_qualified_id
+          type_name: (nested_identifier
             (identifier)
             (identifier))
           initializer: (ui_object_initializer))))))
@@ -281,7 +281,7 @@ MyItem {
             object: (identifier)
             property: (property_identifier))))
       (ui_binding
-        name: (ui_qualified_id
+        name: (nested_identifier
           (identifier)
           (identifier))
         value: (expression_statement
@@ -501,24 +501,24 @@ MyItem {
           (identifier))
         name: (identifier))
       (ui_property
-        type: (ui_qualified_id
+        type: (nested_identifier
           (identifier)
           (identifier))
         name: (identifier)
         value: (ui_object_definition
-          type_name: (ui_qualified_id
+          type_name: (nested_identifier
             (identifier)
             (identifier))
           initializer: (ui_object_initializer)))
       (ui_property
         type: (ui_list_property_type
-          (ui_qualified_id
+          (nested_identifier
             (identifier)
             (identifier)))
         name: (identifier)
         value: (ui_object_array
           (ui_object_definition
-            type_name: (ui_qualified_id
+            type_name: (nested_identifier
               (identifier)
               (identifier))
             initializer: (ui_object_initializer))))
@@ -568,11 +568,11 @@ MyItem {
         parameters: (ui_signal_parameters
           (ui_signal_parameter
             name: (identifier)
-            type: (ui_qualified_id
+            type: (nested_identifier
               (identifier)
               (identifier)))
           (ui_signal_parameter
-            type: (ui_qualified_id
+            type: (nested_identifier
               (identifier)
               (identifier))
             name: (identifier))
diff --git a/test/corpus/identifiers.txt b/test/corpus/identifiers.txt
index be53d1780..dc6feb3a6 100644
--- a/test/corpus/identifiers.txt
+++ b/test/corpus/identifiers.txt
@@ -601,7 +601,7 @@ OtObject {
         (identifier)
         (ui_object_initializer))
       (ui_object_definition
-        (ui_qualified_id
+        (nested_identifier
           (identifier)
           (identifier))
         (ui_object_initializer)))))