Updated function references
Update some pages