refactoring unconsistent naming