Function rename: to unify the naming convention