Backport entity_name override.