I use the terms Traditional Shamanism and Core Shamanism. Some people like to use the term Cross-Cultural Shamanism for the last group. In my opinion both styles are good. The first one is old, the second one is new.
My Shamanic Practice falls in between these two styles. I'm strongly interested by Germanic shamanism, yet fill in the gaps with Core Shamanism. Also in my practice with clients I work almost entirely through Core Shamanism.
I do not normally call myself a Shaman, yet prefer to use the term Shamanic Practitioner, which is more neutral and indicates the respect we modern practitioners have for traditional tribal shamans. Sometimes I use the word Neo-Shaman in order to make the difference.