Refactor naming
Updated readme