Update missing name changes, rename PHPCR to Phpcr and ORM to Orm