Ensure that join columns are given unique names