You will need to remove the headlamp and the retaining assembly (headlamp bucket) by pulling on the spring until it is disengaged from the hole on the side of the headlamp outer retaining ring. There are two only two different headlamp retaining assemblies used. You need to move the inner left headlamp to the outer right hand position, and the inner right headlamp to the outer left hand position. The outer left headlamp bucket will now move to the inner right hand position, and the outer right hand bucket will move to the inner left hand position. The inner high beam headlamp has 2 terminals on the rear, and the outer high / low beam headlamp has 3 terminals on the rear. The mix up that you presently have is a common error that happens in body shops where the person putting the car back together isn't paying attention. In your case, it is the body shop getting even......... :rofl1:
PS...
sometimes the headlamp buckets are marked L 1 and L 2 for the left side on the tab where it attach's to the headlamp adjusting screw. The right side will be similarly marked.