Switch other repos to omni-4.4-pvr, and syntax fix.