Changed some labels to make it closer to the XML Schema