Some renaming to avoid spurious warnings on some old GCC versions.