DMZ - How to resolve object naming conflict?

[eluser]nottRobin[/eluser]
The Model can actually be named anything, so the solution I've gone with for the time being is to prefix all my model classes with 'Model_'. It's not an ideal solution as it requires a fair bit of extra typing, and extra code, as all my relationships now have to be explicitly defined:

Code:

class Model_participant extends DataMapper {
    var $table = 'participant';
    var $has_one = array('organisation' => array('class' => 'organisation', 'other_field' => 'participant'));
}
/* End of file model_participant.php */

This then allows my controller to work fine:

Code:

class Participant extends Controller {
    function index() {
        $p = new Model_participant();
        $p->get(); // No error :)
    }
}
/* End of file participant.php */

I'd still love a more elegant solution though, so I don't have to write all the extra code.