Resolve public identifiers and remap system identifiers