Fix confusing (but irrelevant :-) function names.