ENG-5690: Clearer naming