Google Assistant Entity Name Matching

I have entities that have overlapping names which seems to be confusing either Google Assistant or Home Assistant. I’m using Nabu Casa for GA integration.

When I say “Hey Google, turn off the kitchen lights” it turns off light.kitchen and switch.kitchen_aquarium, but I only want it to turn off light.kitchen. When I say “Hey Google, turn off the nightstand lights” it turns off group.nightstands and light.guest_nightstand, but I want it to do just the nightstand group. group.nightstands include light.nightstand_r, light.nightstand_l, and light.dresser.

What are the best practices to avoid this behavior?

Relevant configuration.yaml:

cloud:
  google_actions:
    filter:
      include_domains:
        - switch
        - light
        - input_boolean
        - scene
        - fan
        - group
    entity_config:
      light.nook:
        aliases:
          - 'breakfast nook'
          - 'nook'
      light.foyer:
        aliases:
          - 'foyer'
          - 'foyer chandelier'
      light.master_fan_light:
        aliases:
          - fan light
          - master light