Update readme and renaming fixes