[updated] naming refactoring