Rename and more xmls
name changes