Update function nameing convention