[Entity] updating naming conventions