Rename TS6 hooks to proper generic names.