Updated terminology to match paper