Rename private functions