Unify function names from guessing and disamb modules