Fix function naming structure.