Some refactoring
Change XML tag according to previous change