a bunch of renaming and little copy tweaks