renaming classes, inlining visit methods