Refactor some name