diff --git a/ChangeLog b/ChangeLog
index bfe0a8e8..58aefe96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 - catch lcms error messages
 - fix includes for gtk+-3.0
 - report virtual memory too in im__print_all()
+- cosmetic changes to nohalo
 
 25/3/09 started 7.18.0
 - revised version numbers
diff --git a/libsrc/resample/nohalo1.cpp b/libsrc/resample/nohalo1.cpp
index bb681552..1e2f2eb8 100644
--- a/libsrc/resample/nohalo1.cpp
+++ b/libsrc/resample/nohalo1.cpp
@@ -546,9 +546,9 @@ nohalo1( const double           uno_two,
       } while (--band); \
   }
 
-NOHALO1_INTER( float )
-NOHALO1_INTER( signed )
-NOHALO1_INTER( unsigned )
+NOHALO1_INTER( fptypes )
+NOHALO1_INTER( hassign )
+NOHALO1_INTER( nosign )
 
 /* We need C linkage for this.
  */
@@ -613,39 +613,39 @@ vips_interpolate_nohalo1_interpolate( VipsInterpolate* restrict interpolate,
 
   switch( in->im->BandFmt ) {
   case IM_BANDFMT_UCHAR:
-    CALL( unsigned char, unsigned );
+    CALL( unsigned char, nosign );
     break;
 
   case IM_BANDFMT_CHAR:
-    CALL( signed char, signed );
+    CALL( signed char, hassign );
     break;
   
   case IM_BANDFMT_USHORT:
-    CALL( unsigned short, unsigned );
+    CALL( unsigned short, nosign );
     break;
   
   case IM_BANDFMT_SHORT:
-    CALL( signed short, signed );
+    CALL( signed short, hassign );
     break;
   
   case IM_BANDFMT_UINT:
-    CALL( unsigned int, unsigned );
+    CALL( unsigned int, nosign );
     break;
   
   case IM_BANDFMT_INT:
-    CALL( signed int, signed );
+    CALL( signed int, hassign );
     break;
   
   /* Complex images handled by doubling of bands, see above.
    */
   case IM_BANDFMT_FLOAT:
   case IM_BANDFMT_COMPLEX:
-    CALL( float, float );
+    CALL( float, fptypes );
     break;
   
   case IM_BANDFMT_DOUBLE:
   case IM_BANDFMT_DPCOMPLEX:
-    CALL( double, float );
+    CALL( double, fptypes );
     break;
   
   default:
diff --git a/libsrc/resample/snohalo1.cpp b/libsrc/resample/snohalo1.cpp
index f2b8113a..9fe2f016 100644
--- a/libsrc/resample/snohalo1.cpp
+++ b/libsrc/resample/snohalo1.cpp
@@ -480,9 +480,9 @@ snohalo1( const double           blur,
       } while (--band); \
   }
 
-SNOHALO1_INTER( float )
-SNOHALO1_INTER( signed )
-SNOHALO1_INTER( unsigned )
+SNOHALO1_INTER( fptypes )
+SNOHALO1_INTER( hassign )
+SNOHALO1_INTER( nosign )
 
 /* We need C linkage for this.
  */
@@ -550,39 +550,39 @@ vips_interpolate_snohalo1_interpolate( VipsInterpolate* restrict interpolate,
 
   switch( in->im->BandFmt ) {
   case IM_BANDFMT_UCHAR:
-    CALL( unsigned char, unsigned );
+    CALL( unsigned char, nosign );
     break;
 
   case IM_BANDFMT_CHAR:
-    CALL( signed char, signed );
+    CALL( signed char, hassign );
     break;
   
   case IM_BANDFMT_USHORT:
-    CALL( unsigned short, unsigned );
+    CALL( unsigned short, nosign );
     break;
   
   case IM_BANDFMT_SHORT:
-    CALL( signed short, signed );
+    CALL( signed short, hassign );
     break;
   
   case IM_BANDFMT_UINT:
-    CALL( unsigned int, unsigned );
+    CALL( unsigned int, nosign );
     break;
   
   case IM_BANDFMT_INT:
-    CALL( signed int, signed );
+    CALL( signed int, hassign );
     break;
   
   /* Complex images handled by doubling of bands, see above.
    */
   case IM_BANDFMT_FLOAT:
   case IM_BANDFMT_COMPLEX:
-    CALL( float, float );
+    CALL( float, fptypes );
     break;
   
   case IM_BANDFMT_DOUBLE:
   case IM_BANDFMT_DPCOMPLEX:
-    CALL( double, float );
+    CALL( double, fptypes );
     break;
   
   default:
diff --git a/libsrc/resample/templates.h b/libsrc/resample/templates.h
index 7a7e58eb..9fd75668 100644
--- a/libsrc/resample/templates.h
+++ b/libsrc/resample/templates.h
@@ -46,7 +46,7 @@
 /* Bilinear for float and double types.
  */
 template <typename T> static T inline
-bilinear_float( 
+bilinear_fptypes( 
 	const double w_times_z,
 	const double x_times_z,
 	const double w_times_y,
@@ -68,7 +68,7 @@ bilinear_float(
 /* Interpolate for signed integer types.
  */
 template <typename T> static T inline
-bilinear_signed( 
+bilinear_hassign( 
 	const double w_times_z,
 	const double x_times_z,
 	const double w_times_y,
@@ -96,7 +96,7 @@ bilinear_signed(
 /* Interpolate for unsigned integer types.
  */
 template <typename T> static T inline
-bilinear_unsigned( 
+bilinear_nosign( 
 	const double w_times_z,
 	const double x_times_z,
 	const double w_times_y,