Refer to QM manual and update terminology to match