A polymath has multiple areas of specialization or expertise, a generalist has (even more) multiple areas of competence. These aren't mutually exclusive. Note the special case of the generalist with ONE area of expertise is the "t-shaped" individual, which is probably a more appropriate baseline goal than anything else. Although I am not sure how domain knowledge intersects with technical skills as a matter of strategy...