Propose some better naming schema for the functions. The current names seem to be unnecessarily long.