STY: Rename sort functions again, omit the npy_ bit from the suffix.

3 files changed, 151 insertions, 153 deletions

diff --git a/numpy/core/include/numpy/npy_sort.h b/numpy/core/include/numpy/npy_sort.h
index 0c0b77bcf..94d831f86 100644
--- a/numpy/core/include/numpy/npy_sort.h
+++ b/numpy/core/include/numpy/npy_sort.h
@@ -7,163 +7,163 @@
 #include <numpy/ndarraytypes.h>
 
 
-int quicksort_npy_bool(npy_bool *vec, npy_intp cnt, void *null);
-int heapsort_npy_bool(npy_bool *vec, npy_intp cnt, void *null);
-int mergesort_npy_bool(npy_bool *vec, npy_intp cnt, void *null);
-int aquicksort_npy_bool(npy_bool *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_bool(npy_bool *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_bool(npy_bool *vec, npy_intp *ind, npy_intp cnt, void *null);
+int quicksort_bool(npy_bool *vec, npy_intp cnt, void *null);
+int heapsort_bool(npy_bool *vec, npy_intp cnt, void *null);
+int mergesort_bool(npy_bool *vec, npy_intp cnt, void *null);
+int aquicksort_bool(npy_bool *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_bool(npy_bool *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_bool(npy_bool *vec, npy_intp *ind, npy_intp cnt, void *null);
 
 
-int quicksort_npy_byte(npy_byte *vec, npy_intp cnt, void *null);
-int heapsort_npy_byte(npy_byte *vec, npy_intp cnt, void *null);
-int mergesort_npy_byte(npy_byte *vec, npy_intp cnt, void *null);
-int aquicksort_npy_byte(npy_byte *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_byte(npy_byte *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_byte(npy_byte *vec, npy_intp *ind, npy_intp cnt, void *null);
-
-
-int quicksort_npy_ubyte(npy_ubyte *vec, npy_intp cnt, void *null);
-int heapsort_npy_ubyte(npy_ubyte *vec, npy_intp cnt, void *null);
-int mergesort_npy_ubyte(npy_ubyte *vec, npy_intp cnt, void *null);
-int aquicksort_npy_ubyte(npy_ubyte *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_ubyte(npy_ubyte *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_ubyte(npy_ubyte *vec, npy_intp *ind, npy_intp cnt, void *null);
+int quicksort_byte(npy_byte *vec, npy_intp cnt, void *null);
+int heapsort_byte(npy_byte *vec, npy_intp cnt, void *null);
+int mergesort_byte(npy_byte *vec, npy_intp cnt, void *null);
+int aquicksort_byte(npy_byte *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_byte(npy_byte *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_byte(npy_byte *vec, npy_intp *ind, npy_intp cnt, void *null);
+
+
+int quicksort_ubyte(npy_ubyte *vec, npy_intp cnt, void *null);
+int heapsort_ubyte(npy_ubyte *vec, npy_intp cnt, void *null);
+int mergesort_ubyte(npy_ubyte *vec, npy_intp cnt, void *null);
+int aquicksort_ubyte(npy_ubyte *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_ubyte(npy_ubyte *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_ubyte(npy_ubyte *vec, npy_intp *ind, npy_intp cnt, void *null);
 
 
-int quicksort_npy_short(npy_short *vec, npy_intp cnt, void *null);
-int heapsort_npy_short(npy_short *vec, npy_intp cnt, void *null);
-int mergesort_npy_short(npy_short *vec, npy_intp cnt, void *null);
-int aquicksort_npy_short(npy_short *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_short(npy_short *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_short(npy_short *vec, npy_intp *ind, npy_intp cnt, void *null);
-
-
-int quicksort_npy_ushort(npy_ushort *vec, npy_intp cnt, void *null);
-int heapsort_npy_ushort(npy_ushort *vec, npy_intp cnt, void *null);
-int mergesort_npy_ushort(npy_ushort *vec, npy_intp cnt, void *null);
-int aquicksort_npy_ushort(npy_ushort *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_ushort(npy_ushort *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_ushort(npy_ushort *vec, npy_intp *ind, npy_intp cnt, void *null);
+int quicksort_short(npy_short *vec, npy_intp cnt, void *null);
+int heapsort_short(npy_short *vec, npy_intp cnt, void *null);
+int mergesort_short(npy_short *vec, npy_intp cnt, void *null);
+int aquicksort_short(npy_short *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_short(npy_short *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_short(npy_short *vec, npy_intp *ind, npy_intp cnt, void *null);
+
+
+int quicksort_ushort(npy_ushort *vec, npy_intp cnt, void *null);
+int heapsort_ushort(npy_ushort *vec, npy_intp cnt, void *null);
+int mergesort_ushort(npy_ushort *vec, npy_intp cnt, void *null);
+int aquicksort_ushort(npy_ushort *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_ushort(npy_ushort *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_ushort(npy_ushort *vec, npy_intp *ind, npy_intp cnt, void *null);
 
 
-int quicksort_npy_int(npy_int *vec, npy_intp cnt, void *null);
-int heapsort_npy_int(npy_int *vec, npy_intp cnt, void *null);
-int mergesort_npy_int(npy_int *vec, npy_intp cnt, void *null);
-int aquicksort_npy_int(npy_int *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_int(npy_int *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_int(npy_int *vec, npy_intp *ind, npy_intp cnt, void *null);
-
-
-int quicksort_npy_uint(npy_uint *vec, npy_intp cnt, void *null);
-int heapsort_npy_uint(npy_uint *vec, npy_intp cnt, void *null);
-int mergesort_npy_uint(npy_uint *vec, npy_intp cnt, void *null);
-int aquicksort_npy_uint(npy_uint *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_uint(npy_uint *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_uint(npy_uint *vec, npy_intp *ind, npy_intp cnt, void *null);
-
-
-int quicksort_npy_long(npy_long *vec, npy_intp cnt, void *null);
-int heapsort_npy_long(npy_long *vec, npy_intp cnt, void *null);
-int mergesort_npy_long(npy_long *vec, npy_intp cnt, void *null);
-int aquicksort_npy_long(npy_long *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_long(npy_long *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_long(npy_long *vec, npy_intp *ind, npy_intp cnt, void *null);
-
-
-int quicksort_npy_ulong(npy_ulong *vec, npy_intp cnt, void *null);
-int heapsort_npy_ulong(npy_ulong *vec, npy_intp cnt, void *null);
-int mergesort_npy_ulong(npy_ulong *vec, npy_intp cnt, void *null);
-int aquicksort_npy_ulong(npy_ulong *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_ulong(npy_ulong *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_ulong(npy_ulong *vec, npy_intp *ind, npy_intp cnt, void *null);
-
-
-int quicksort_npy_longlong(npy_longlong *vec, npy_intp cnt, void *null);
-int heapsort_npy_longlong(npy_longlong *vec, npy_intp cnt, void *null);
-int mergesort_npy_longlong(npy_longlong *vec, npy_intp cnt, void *null);
-int aquicksort_npy_longlong(npy_longlong *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_longlong(npy_longlong *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_longlong(npy_longlong *vec, npy_intp *ind, npy_intp cnt, void *null);
-
-
-int quicksort_npy_ulonglong(npy_ulonglong *vec, npy_intp cnt, void *null);
-int heapsort_npy_ulonglong(npy_ulonglong *vec, npy_intp cnt, void *null);
-int mergesort_npy_ulonglong(npy_ulonglong *vec, npy_intp cnt, void *null);
-int aquicksort_npy_ulonglong(npy_ulonglong *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_ulonglong(npy_ulonglong *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_ulonglong(npy_ulonglong *vec, npy_intp *ind, npy_intp cnt, void *null);
-
-
-int quicksort_npy_half(npy_ushort *vec, npy_intp cnt, void *null);
-int heapsort_npy_half(npy_ushort *vec, npy_intp cnt, void *null);
-int mergesort_npy_half(npy_ushort *vec, npy_intp cnt, void *null);
-int aquicksort_npy_half(npy_ushort *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_half(npy_ushort *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_half(npy_ushort *vec, npy_intp *ind, npy_intp cnt, void *null);
-
-
-int quicksort_npy_float(npy_float *vec, npy_intp cnt, void *null);
-int heapsort_npy_float(npy_float *vec, npy_intp cnt, void *null);
-int mergesort_npy_float(npy_float *vec, npy_intp cnt, void *null);
-int aquicksort_npy_float(npy_float *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_float(npy_float *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_float(npy_float *vec, npy_intp *ind, npy_intp cnt, void *null);
+int quicksort_int(npy_int *vec, npy_intp cnt, void *null);
+int heapsort_int(npy_int *vec, npy_intp cnt, void *null);
+int mergesort_int(npy_int *vec, npy_intp cnt, void *null);
+int aquicksort_int(npy_int *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_int(npy_int *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_int(npy_int *vec, npy_intp *ind, npy_intp cnt, void *null);
+
+
+int quicksort_uint(npy_uint *vec, npy_intp cnt, void *null);
+int heapsort_uint(npy_uint *vec, npy_intp cnt, void *null);
+int mergesort_uint(npy_uint *vec, npy_intp cnt, void *null);
+int aquicksort_uint(npy_uint *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_uint(npy_uint *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_uint(npy_uint *vec, npy_intp *ind, npy_intp cnt, void *null);
+
+
+int quicksort_long(npy_long *vec, npy_intp cnt, void *null);
+int heapsort_long(npy_long *vec, npy_intp cnt, void *null);
+int mergesort_long(npy_long *vec, npy_intp cnt, void *null);
+int aquicksort_long(npy_long *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_long(npy_long *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_long(npy_long *vec, npy_intp *ind, npy_intp cnt, void *null);
+
+
+int quicksort_ulong(npy_ulong *vec, npy_intp cnt, void *null);
+int heapsort_ulong(npy_ulong *vec, npy_intp cnt, void *null);
+int mergesort_ulong(npy_ulong *vec, npy_intp cnt, void *null);
+int aquicksort_ulong(npy_ulong *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_ulong(npy_ulong *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_ulong(npy_ulong *vec, npy_intp *ind, npy_intp cnt, void *null);
+
+
+int quicksort_longlong(npy_longlong *vec, npy_intp cnt, void *null);
+int heapsort_longlong(npy_longlong *vec, npy_intp cnt, void *null);
+int mergesort_longlong(npy_longlong *vec, npy_intp cnt, void *null);
+int aquicksort_longlong(npy_longlong *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_longlong(npy_longlong *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_longlong(npy_longlong *vec, npy_intp *ind, npy_intp cnt, void *null);
+
+
+int quicksort_ulonglong(npy_ulonglong *vec, npy_intp cnt, void *null);
+int heapsort_ulonglong(npy_ulonglong *vec, npy_intp cnt, void *null);
+int mergesort_ulonglong(npy_ulonglong *vec, npy_intp cnt, void *null);
+int aquicksort_ulonglong(npy_ulonglong *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_ulonglong(npy_ulonglong *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_ulonglong(npy_ulonglong *vec, npy_intp *ind, npy_intp cnt, void *null);
+
+
+int quicksort_half(npy_ushort *vec, npy_intp cnt, void *null);
+int heapsort_half(npy_ushort *vec, npy_intp cnt, void *null);
+int mergesort_half(npy_ushort *vec, npy_intp cnt, void *null);
+int aquicksort_half(npy_ushort *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_half(npy_ushort *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_half(npy_ushort *vec, npy_intp *ind, npy_intp cnt, void *null);
+
+
+int quicksort_float(npy_float *vec, npy_intp cnt, void *null);
+int heapsort_float(npy_float *vec, npy_intp cnt, void *null);
+int mergesort_float(npy_float *vec, npy_intp cnt, void *null);
+int aquicksort_float(npy_float *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_float(npy_float *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_float(npy_float *vec, npy_intp *ind, npy_intp cnt, void *null);
 
 
-int quicksort_npy_double(npy_double *vec, npy_intp cnt, void *null);
-int heapsort_npy_double(npy_double *vec, npy_intp cnt, void *null);
-int mergesort_npy_double(npy_double *vec, npy_intp cnt, void *null);
-int aquicksort_npy_double(npy_double *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_double(npy_double *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_double(npy_double *vec, npy_intp *ind, npy_intp cnt, void *null);
-
-
-int quicksort_npy_longdouble(npy_longdouble *vec, npy_intp cnt, void *null);
-int heapsort_npy_longdouble(npy_longdouble *vec, npy_intp cnt, void *null);
-int mergesort_npy_longdouble(npy_longdouble *vec, npy_intp cnt, void *null);
-int aquicksort_npy_longdouble(npy_longdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_longdouble(npy_longdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_longdouble(npy_longdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
+int quicksort_double(npy_double *vec, npy_intp cnt, void *null);
+int heapsort_double(npy_double *vec, npy_intp cnt, void *null);
+int mergesort_double(npy_double *vec, npy_intp cnt, void *null);
+int aquicksort_double(npy_double *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_double(npy_double *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_double(npy_double *vec, npy_intp *ind, npy_intp cnt, void *null);
+
+
+int quicksort_longdouble(npy_longdouble *vec, npy_intp cnt, void *null);
+int heapsort_longdouble(npy_longdouble *vec, npy_intp cnt, void *null);
+int mergesort_longdouble(npy_longdouble *vec, npy_intp cnt, void *null);
+int aquicksort_longdouble(npy_longdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_longdouble(npy_longdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_longdouble(npy_longdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
 
 
-int quicksort_npy_cfloat(npy_cfloat *vec, npy_intp cnt, void *null);
-int heapsort_npy_cfloat(npy_cfloat *vec, npy_intp cnt, void *null);
-int mergesort_npy_cfloat(npy_cfloat *vec, npy_intp cnt, void *null);
-int aquicksort_npy_cfloat(npy_cfloat *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_cfloat(npy_cfloat *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_cfloat(npy_cfloat *vec, npy_intp *ind, npy_intp cnt, void *null);
-
-
-int quicksort_npy_cdouble(npy_cdouble *vec, npy_intp cnt, void *null);
-int heapsort_npy_cdouble(npy_cdouble *vec, npy_intp cnt, void *null);
-int mergesort_npy_cdouble(npy_cdouble *vec, npy_intp cnt, void *null);
-int aquicksort_npy_cdouble(npy_cdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_cdouble(npy_cdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_cdouble(npy_cdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
+int quicksort_cfloat(npy_cfloat *vec, npy_intp cnt, void *null);
+int heapsort_cfloat(npy_cfloat *vec, npy_intp cnt, void *null);
+int mergesort_cfloat(npy_cfloat *vec, npy_intp cnt, void *null);
+int aquicksort_cfloat(npy_cfloat *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_cfloat(npy_cfloat *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_cfloat(npy_cfloat *vec, npy_intp *ind, npy_intp cnt, void *null);
+
+
+int quicksort_cdouble(npy_cdouble *vec, npy_intp cnt, void *null);
+int heapsort_cdouble(npy_cdouble *vec, npy_intp cnt, void *null);
+int mergesort_cdouble(npy_cdouble *vec, npy_intp cnt, void *null);
+int aquicksort_cdouble(npy_cdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_cdouble(npy_cdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_cdouble(npy_cdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
 
 
-int quicksort_npy_clongdouble(npy_clongdouble *vec, npy_intp cnt, void *null);
-int heapsort_npy_clongdouble(npy_clongdouble *vec, npy_intp cnt, void *null);
-int mergesort_npy_clongdouble(npy_clongdouble *vec, npy_intp cnt, void *null);
-int aquicksort_npy_clongdouble(npy_clongdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
-int aheapsort_npy_clongdouble(npy_clongdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
-int amergesort_npy_clongdouble(npy_clongdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
-
-
-int quicksort_npy_string(npy_char *vec, npy_intp cnt, PyArrayObject *arr);
-int heapsort_npy_string(npy_char *vec, npy_intp cnt, PyArrayObject *arr);
-int mergesort_npy_string(npy_char *vec, npy_intp cnt, PyArrayObject *arr);
-int aquicksort_npy_string(npy_char *vec, npy_intp *ind, npy_intp cnt, PyArrayObject *arr);
-int aheapsort_npy_string(npy_char *vec, npy_intp *ind, npy_intp cnt, PyArrayObject *arr);
-int amergesort_npy_string(npy_char *vec, npy_intp *ind, npy_intp cnt, PyArrayObject *arr);
+int quicksort_clongdouble(npy_clongdouble *vec, npy_intp cnt, void *null);
+int heapsort_clongdouble(npy_clongdouble *vec, npy_intp cnt, void *null);
+int mergesort_clongdouble(npy_clongdouble *vec, npy_intp cnt, void *null);
+int aquicksort_clongdouble(npy_clongdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
+int aheapsort_clongdouble(npy_clongdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
+int amergesort_clongdouble(npy_clongdouble *vec, npy_intp *ind, npy_intp cnt, void *null);
+
+
+int quicksort_string(npy_char *vec, npy_intp cnt, PyArrayObject *arr);
+int heapsort_string(npy_char *vec, npy_intp cnt, PyArrayObject *arr);
+int mergesort_string(npy_char *vec, npy_intp cnt, PyArrayObject *arr);
+int aquicksort_string(npy_char *vec, npy_intp *ind, npy_intp cnt, PyArrayObject *arr);
+int aheapsort_string(npy_char *vec, npy_intp *ind, npy_intp cnt, PyArrayObject *arr);
+int amergesort_string(npy_char *vec, npy_intp *ind, npy_intp cnt, PyArrayObject *arr);
 
 
-int quicksort_npy_unicode(npy_ucs4 *vec, npy_intp cnt, PyArrayObject *arr);
-int heapsort_npy_unicode(npy_ucs4 *vec, npy_intp cnt, PyArrayObject *arr);
-int mergesort_npy_unicode(npy_ucs4 *vec, npy_intp cnt, PyArrayObject *arr);
-int aquicksort_npy_unicode(npy_ucs4 *vec, npy_intp *ind, npy_intp cnt, PyArrayObject *arr);
-int aheapsort_npy_unicode(npy_ucs4 *vec, npy_intp *ind, npy_intp cnt, PyArrayObject *arr);
-int amergesort_npy_unicode(npy_ucs4 *vec, npy_intp *ind, npy_intp cnt, PyArrayObject *arr);
+int quicksort_unicode(npy_ucs4 *vec, npy_intp cnt, PyArrayObject *arr);
+int heapsort_unicode(npy_ucs4 *vec, npy_intp cnt, PyArrayObject *arr);
+int mergesort_unicode(npy_ucs4 *vec, npy_intp cnt, PyArrayObject *arr);
+int aquicksort_unicode(npy_ucs4 *vec, npy_intp *ind, npy_intp cnt, PyArrayObject *arr);
+int aheapsort_unicode(npy_ucs4 *vec, npy_intp *ind, npy_intp cnt, PyArrayObject *arr);
+int amergesort_unicode(npy_ucs4 *vec, npy_intp *ind, npy_intp cnt, PyArrayObject *arr);
 
 #endif
diff --git a/numpy/core/src/npysort/sort.c.src b/numpy/core/src/npysort/sort.c.src
index 3e2f320d4..bb276b826 100644
--- a/numpy/core/src/npysort/sort.c.src
+++ b/numpy/core/src/npysort/sort.c.src
@@ -49,10 +49,9 @@
  * #TYPE = BOOL, BYTE, UBYTE, SHORT, USHORT, INT, UINT, LONG, ULONG,
  *         LONGLONG, ULONGLONG, HALF, FLOAT, DOUBLE, LONGDOUBLE,
  *         CFLOAT, CDOUBLE, CLONGDOUBLE#
- * #suff = npy_bool, npy_byte, npy_ubyte, npy_short, npy_ushort, npy_int,
- *         npy_uint, npy_long, npy_ulong, npy_longlong, npy_ulonglong,
- *         npy_half, npy_float, npy_double, npy_longdouble, npy_cfloat,
- *         npy_cdouble, npy_clongdouble#
+ * #suff = bool, byte, ubyte, short, ushort, int, uint, long, ulong,
+ *         longlong, ulonglong, half, float, double, longdouble,
+ *         cfloat, cdouble, clongdouble#
  * #type = npy_bool, npy_byte, npy_ubyte, npy_short, npy_ushort, npy_int,
  *         npy_uint, npy_long, npy_ulong, npy_longlong, npy_ulonglong,
  *         npy_ushort, npy_float, npy_double, npy_longdouble, npy_cfloat,
@@ -418,7 +417,7 @@ amergesort_@suff@(@type@ *v, npy_intp *tosort, npy_intp num, void *NOT_USED)
 /**begin repeat
  *
  * #TYPE = STRING, UNICODE#
- * #suff = npy_string, npy_unicode#
+ * #suff = string, unicode#
  * #type = npy_char, npy_ucs4#
  */
 
diff --git a/numpy/core/src/npysort/sortmodule.c.src b/numpy/core/src/npysort/sortmodule.c.src
index 6f59b0cf9..def51fe10 100644
--- a/numpy/core/src/npysort/sortmodule.c.src
+++ b/numpy/core/src/npysort/sortmodule.c.src
@@ -40,10 +40,9 @@ add_sortfuncs(void)
      * #TYPE = BOOL, BYTE, UBYTE, SHORT, USHORT, INT, UINT, LONG, ULONG,
      *         LONGLONG, ULONGLONG, HALF, FLOAT, DOUBLE, LONGDOUBLE,
      *         CFLOAT, CDOUBLE, CLONGDOUBLE, STRING, UNICODE#
-     * #suff = npy_bool, npy_byte, npy_ubyte, npy_short, npy_ushort, npy_int,
-     *         npy_uint, npy_long, npy_ulong, npy_longlong, npy_ulonglong,
-     *         npy_half, npy_float, npy_double, npy_longdouble, npy_cfloat,
-     *         npy_cdouble, npy_clongdouble, npy_string, npy_unicode#
+     * #suff = bool, byte, ubyte, short, ushort, int, uint, long, ulong,
+     *         longlong, ulonglong, half, float, double, longdouble,
+     *         cfloat, cdouble, clongdouble, string, unicode#
      */
     descr = PyArray_DescrFromType(PyArray_@TYPE@);
     descr->f->sort[PyArray_QUICKSORT] =