Tweak some algorithm naming inconsistencies