Fix: Check for name collisions when adding fields/mappings

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>