Refactoring ugly names
Refactor API