It wouldn't be the first time different architectures or even processes are mixed in the same generational name.
As for Raven Ridge specifically, as far as I'm aware, it's not Zen+. The Zen+ variant of Raven is called Picasso, and it will come in late 2018 or early 2019. That said the lines are a bit blurred as to what constitutes Zen+. Raven Ridge will have an updated SMU for Precision Boost 2 and no doubt various other IP blocks that are more up to date than Ryzen's. Memory controller might even be the one we're going to see in Pinnacle Ridge.
So, to be honest, it's a question that even after the dust settles and all chips are released and analyzed, we might disagree about. (Unless AMD officially names them)