Refactor names
Refactor names
Refactor names in Readme