Naming changes and updated readme