Dropped the Visitor prefix on many of the names.