Fixed references to previously renamed functions