Refactor some names
Refactor some names