Fixed old function references