Use identifier_name if set, and entity_identifier_name is not

- To keep BC