ENG-5901-real: rename vars...move mpid check down.