Mostly correct, except Zen (and Zen+, and Zen 2) has eight cores per die. You may have been thinking of core complexes (CCXs), of which there are two on a die,

Mostly correct, except Zen (and Zen+, and Zen 2) has eight cores per die. You may have been thinking of core complexes (CCXs), of which there are two on a die, and each CCX has four cores.