Class renaming and update README.md