These are both correct, more or less.
I assigned
myself certain design requirements. One of those was "If we know what WotC's plans are for a certain class (such as the druid, which they talk about in
Classes and Races), then the version I create for APG should go a different route."
Fortunately, this was pretty easy to do, since it dovetailed nicely with my "try to keep the flavor of older editions, as per Necromancer's company policy."
And yes, I do suggest alternate names at the start of the chapter.
My hope is, although I know most people will buy this book to "fill in the gaps," that they'll continue to use these classes once the "official" ones are out--not
instead of the official versions, but in addition to 'em.