Minor, better function names refs BT#7016