Refactor (rename and type change)