general: fix for duplicate + non-unique names