Should we now be calling these things "phpcr_odm_*" ? /cc @dbu