rename a few function name.