Clarify entity names