Merge "Rename helper function" into sc-dev