Update README.md
Naming convention horror.. And some cleanup