Additional readme fixes and renaming
Renaming