fix: same name and different location in param + small refactor (#2250) Fixed #2222 (Not being able to have different discriminator values map to the same entity) by switching key and value in map (#2249)