Bugfix for mapping renaming