A generalist will include both polymaths and those that have mediocre skillsets. Polymath is a sufficiently distinct concept to have its own term.