Also fixup pname/name, and drop '-git-' in the middle of the two. (missed when moving off git revisions)