Rename helper functions