Refactoring stub naming match ALG