fix checking shaberu and function names