Names of visitor classes simplified.