Updated naming. Added start for entities.