Updated readme and name refactoring