a bunch of cosmetic name and other changes