Rename function and fix bug.