refactoring on external function names