new entity based naming