Fix wrong renamings still in new map