Issue #180 - Make models conform with CakePHP style