VINJE/RAULAND PARISH

I am working on family research that has led me to the Vinje/Rauland region of Norway. I'm a bit confused about how to record the place names for this region. The farm name remains a constant, but the record sources indicate that sometimes I'm in the Rauland Parish and other times I'm in the Vinje Parish. I know that Rauland eventually became its own clerical district (?), but am uncertain of the political structure in Norway so it doesn't give me much clarification. My question: Is it most accurate to use Vinje prior to 1859 (perhaps indicating that it was Rauland Parish), or do I simply use Rauland, Telemark? I am simply looking to be as accurate as possible for posterity reasons, but am really confused. Thanks for any clarification I can get. Barb