update function and method names