fix colliding column names for expanded names