Use the correct variable for existing mappings