Review round 1: Only match on mapping type, not name