changes to qi names, for correct plotting