One more visitor class renamed.