Update to match the new terminology