small update and reshuffle of names