More work on parsing xml file. Rename xml tags to proper values.