Rename generic_type to generic_class