Fixed some of the builtin names resolution