Fix incorrect amount of pointer indirections.
Revert to old names; re-add most of the missing aliases.