Updated function namings