diff --git a/generator.cpp b/generator.cpp
index 69828ba..a104d2d 100644
--- a/generator.cpp
+++ b/generator.cpp
@@ -22,9 +22,9 @@
  */
 
 #include "generator.h"
-#include "reporthandler.h"
-#include "fileout.h"
-#include "apiextractor.h"
+#include <apiextractor/reporthandler.h>
+#include <apiextractor/fileout.h>
+#include <apiextractor/apiextractor.h>
 
 #include <QtCore/QDir>
 #include <QtCore/QFile>
@@ -204,7 +204,7 @@ void Generator::replaceTemplateVariables(QString &code, const AbstractMetaFuncti
         code.replace("%TYPE", cpp_class->name());
 
     foreach (AbstractMetaArgument *arg, func->arguments())
-        code.replace("%" + QString::number(arg->argumentIndex() + 1), arg->argumentName());
+        code.replace("%" + QString::number(arg->argumentIndex() + 1), arg->name());
 
     //template values
     code.replace("%RETURN_TYPE", translateType(func->type(), cpp_class));
diff --git a/generator.h b/generator.h
index 2b79135..53e05e8 100644
--- a/generator.h
+++ b/generator.h
@@ -27,7 +27,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QDir>
 #include <QtCore/QLinkedList>
-#include <abstractmetalang.h>
+#include <apiextractor/abstractmetalang.h>
 #include "generatorrunnermacros.h"
 
 class ApiExtractor;
diff --git a/generators/qtdoc/qtdocgenerator.cpp b/generators/qtdoc/qtdocgenerator.cpp
index 4f3a37b..c5dfa83 100644
--- a/generators/qtdoc/qtdocgenerator.cpp
+++ b/generators/qtdoc/qtdocgenerator.cpp
@@ -1076,8 +1076,8 @@ void QtDocGenerator::writeConstructors(QTextStream &s, const AbstractMetaClass *
         writeFunction(s, false, cppClass, func);
         foreach(AbstractMetaArgument *arg, func->arguments())
         {
-            if (!arg_map.contains(arg->argumentName())) {
-                arg_map.insert(arg->argumentName(), arg);
+            if (!arg_map.contains(arg->name())) {
+                arg_map.insert(arg->name(), arg);
             }
         }
     }
@@ -1114,7 +1114,7 @@ QString QtDocGenerator::parseArgDocStyle(const AbstractMetaClass *cppClass, cons
             optional = true;
         }
 
-        ret += arg->argumentName();
+        ret += arg->name();
 
         if (optional)
             ret += "=" + arg->defaultValueExpression();
@@ -1275,7 +1275,7 @@ QString QtDocGenerator::translateToPythonType(const AbstractMetaType *type, cons
 
 void QtDocGenerator::writeParamerteType(QTextStream &s, const AbstractMetaClass *cppClass, const AbstractMetaArgument *arg)
 {
-    s << INDENT << ":param " << arg->argumentName() << ": "
+    s << INDENT << ":param " << arg->name() << ": "
       << translateToPythonType(arg->type(), cppClass) << endl;
 }