Updated the ValueSetDefinition/Resolution naming handling.