Rename helper functions and struct