And for the life of me I can't find the source which alluded to it flip flopping back to the arch codename again.
Unless I dreamt that bit
In any case, my underlying point was the talk of a 7nm+ design with 7000+ shaders is more likely to be the post-Navi, non-GCN "next gen" in 2020. If AMD were going to bust past the 4096 shader limit dogging GCN for so long, I think they would've done it already. Unless of course they did manage it with GCN6 for Navi hence the rumoured "performs better than expected" which might give it another shot in the arm and whole new arch is pushed back from 2020.
According to you, what does Scalability mean on the slide written under Navi?