The really confusing part is, is that the Ryzen 4000 APUs will be zen2 architecture but the desktop CPUs without APUs or the mobile Ryzen 4000 series are zen3 architecture.
I suspect they do this because the APUs typically launch half a year after the GPU-less variants and
What's really confusing and unfortunate is that there are some Ryzen 1000 series variants (Ryzen 3 1200, Ryzen 5 1600) that were re-released well over a year after their initial launch and which are actually Zen+ based.
I found a nice walkthrough of Ryzen products at this page: https://specby.com/ryzen-explained-r3-r5-r7-threadripper-epy...
And the CPU and GPU roadmap is worth a look as well: https://www.digitaltrends.com/computing/amd-ryzen-radeon-roa...
Ryzen 4000 APUs were just announced and also use Zen 2 cores in a monolithic design. These have model numbers that end in G.
Zen 3 based desktop parts are expected late this year. If they follow past naming, they will also be Ryzen 4000 with model numbers sporting an optional X at the end, or no letter suffix.