refactoring due to name scheme