- string mapped_name = get_unused_variable_name(*target_block, var.name, remap_prefix);
- variable_map[var.name] = &var;
+ string mapped_name = get_unused_variable_name(staging_block, var.name, remap_prefix);
+ staging_block.variables[var.name] = &var;
+ if(mapped_name!=var.name)
+ staging_block.variables[mapped_name] = &var;