refactoring. unifying method names