You're completely right, they are two different words. For me that distinction was so clear that I never considered that what I wrote could be interpreted as two genders of the same word, that would make no sense.

I didn't know the origins though, cool.