Updated terminology to match the manual