Isn't 'naturalist' completely different from 'naturist'?

'Naturist' is people wandering about naked, whereas 'naturalist' is... well, it seems to have a whole load of different meanings depending on context, but none of 'em seem to be anything to do with naked-ness.

But that's just me, I could be wrong.