Make xml element names and annotations consistent