* renamed java name classes * rearranged methods in ContextAwareAstVisitor to match the order in AstVisitor