Update code to CakePHP 2.x conventions