Using more descriptive entity_type instead of type_.