WW-4313 Uses name instead of id if the other isn't set