Made naming of class type template consistent with that of other type templates