i dont know why you or whoever would have actually unscrewed the switch but yes, that is right.
as far as i know you cannot interchange the plugs.
go to the harness under there.
with key on you should have 12v at the harness, the switch in the case grounds and turns on the light.