First step to fix a rename issue.