Rename xml to markup, use string member functions