Update funtion names