update README.md, plus some other internal renaming