Second attempt to fix gcc-4.4 errors

This time by renaming functions.