Rename obvious template type names, for consistency