rename methods
Merge branch 'refactoring'