Actually use the new names.