Cleaned up XML names a bit