Rename XPIs