cleanup function names in vim, to follow the more strict mode