Update README.md

Further name changes and updates