update the function definitions to match newer CakePHP style