New naming scheme
Update Readme