Removed custom xml names