renaming + xml refactoring