fix variable name collision between maps