Fixes on type maps and duplicate names