The mistake was made during the Ryzen 1000. they called the APUs (CPU with graphics) Ryzen but the CPU cores were not even Zen.
I know that it takes more then putting another name on to create these CPUs. But since they have the same Architecture they should be in the same generation.
Intel's 10th Gen naming annoys me as well. 10nm and 14nm CPUs all under the same naming scheme. The only reason to do this is to confuse uninformed customers.