[Bug #8783] replaced confusing names