Well I almost want to say that yes Witchcraft has been renamed Necromancy, but I don't think there are many overlapping spells between the two. I do think that Necromancy is essentially going to be the replacement for Witchcraft though.
Shapeshifting and Summoning skill trees are not in yet.