Make sure function naming convention is consistent