new naming based refactor