Change names back to be longer but better.