RVF-129: INPROGRESS : Fixed minor error in when adding engine suffix