Tag names in XML Configuration adjusted