Fix EntityRegistry names to support YAML.