Actually use the right name mapping