diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index cabbfe459b23373464ef33f3b9a02c406c3446f8..259241e7c2d1c6e683f4f50ce6235fe407683d35 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -51,14 +51,14 @@ namespace {
 
 typedef QList< QPair<Name *, FullySpecifiedType> > Substitution;
 
-class Instantiation: protected TypeVisitor, protected NameVisitor
+class GenerateInstance: protected TypeVisitor, protected NameVisitor
 {
     Control *_control;
     FullySpecifiedType _type;
     const Substitution _substitution;
 
 public:
-    Instantiation(Control *control, const Substitution &substitution)
+    GenerateInstance(Control *control, const Substitution &substitution)
         : _control(control),
           _substitution(substitution)
     { }
@@ -807,7 +807,7 @@ ResolveExpression::resolveMember(Name *memberName, Class *klass,
                                            templArgTy));
             }
             
-            Instantiation inst(control(), subst);
+            GenerateInstance inst(control(), subst);
             ty = inst(ty);
         }
         
@@ -842,7 +842,7 @@ ResolveExpression::resolveArrowOperator(const Result &,
                                            templArgTy));
                 }
             }
-            Instantiation inst(control(), subst);
+            GenerateInstance inst(control(), subst);
             ty = inst(ty);
         }
 
@@ -880,7 +880,7 @@ ResolveExpression::resolveArrayOperator(const Result &,
                                            templArgTy));
                 }
             }
-            Instantiation inst(control(), subst);
+            GenerateInstance inst(control(), subst);
             ty = inst(ty);
         }