more "unification" for ucm.xml