hunter2: cleanup, renamed some functions. (no whatsnew)