README.md Update and some renaming.