Rename 510 -> 530.xml and fix wrong guid being searched for