Fix errors due to functions renaming in new source