Updated naming scheme to Cakephp 2.x