Labels added and some self names changed.