lexer: Renamed few funcs