Readme and renaming fixes