various renaming and other changes