Yup. Though rather than say "fruit and fruit" are two words, or focusing on "definitions" (which tend to morph over time anyway), I think the more straightforward and typical approach is to just recognize that the same word can have different meanings in different contexts.
This is such a basic and universal part of language, it is a mystery to me why something so transparently clueless as "actually, tomato is a fruit" persists.