Mainly fixes for built-in functions, and renames.