fixed naming of join columns