Rename function and method