More sensible naming
Improve Readme