Fix compilation for GCC 4.6 and a minor rename.