Correct, I think it was Mark's idea to transition to _context_ as the new term for _class_. Personally, what I think of when I hear _context_ is more what is called a _class expression_, but this is no official stance.