Rename function. Fix reviewing point.