rename some xml components and use correct slash for item end