Use canonical names to make Ghosts happy.