Refactor on the name