[BUG #8114] less confusing method names