Reorder setting of XPI_NAME