8 files changed, 9 insertions, 9 deletions
diff --git a/src/parsers/block/try_block.cpp b/src/parsers/block/try_block.cpp
index bf320f2..8d6f8aa 100644
--- a/src/parsers/block/try_block.cpp
+++ b/src/parsers/block/try_block.cpp
@@ -34,7 +34,7 @@ void parseTryBlockNode(TryBlockNode *node)
     fillExprLocation(node);
     Log::dump(node);
 
-#ifdef ENABLE_CPPLANG
+#ifdef ENABLE_CXXLANG
     setPrintField(node, CLEANUP_P, isClean);
 
     node->body = createParseNode(
diff --git a/src/parsers/cst/ptrmem_cst.cpp b/src/parsers/cst/ptrmem_cst.cpp
index 7934769..e783cdb 100644
--- a/src/parsers/cst/ptrmem_cst.cpp
+++ b/src/parsers/cst/ptrmem_cst.cpp
@@ -33,7 +33,7 @@ void parsePtrMemCstNode(PtrMemCstNode *node)
     fillType(node);
     Log::dump(node);
 
-#ifdef ENABLE_CPPLANG
+#ifdef ENABLE_CXXLANG
     node->record = createParseNode(
         node,
         PTRMEM_CST_CLASS(node->gccNode),
diff --git a/src/parsers/decl/template_decl.cpp b/src/parsers/decl/template_decl.cpp
index 394f427..21220b5 100644
--- a/src/parsers/decl/template_decl.cpp
+++ b/src/parsers/decl/template_decl.cpp
@@ -38,7 +38,7 @@ void parseTemplateDeclNode(TemplateDeclNode *node)
     fillDeclAutoGenerated(node);
     fillDeclAttributes(node);
 
-#ifdef ENABLE_CPPLANG
+#ifdef ENABLE_CXXLANG
     node->specializations = static_cast<TreeListNode*>(createParseNode(
         node,
         DECL_TEMPLATE_SPECIALIZATIONS(node->gccNode),
diff --git a/src/parsers/expr/aggrinit_expr.cpp b/src/parsers/expr/aggrinit_expr.cpp
index b5c17ae..6642631 100644
--- a/src/parsers/expr/aggrinit_expr.cpp
+++ b/src/parsers/expr/aggrinit_expr.cpp
@@ -36,7 +36,7 @@ void parseAggrInitExprNode(AggrInitExprNode *node)
 
     //fillExprOperands(node);
 
-#ifdef ENABLE_CPPLANG
+#ifdef ENABLE_CXXLANG
     node->function = createParseNode(
         node,
         AGGR_INIT_EXPR_FN(node->gccNode),
diff --git a/src/parsers/expr/vecinit_expr.cpp b/src/parsers/expr/vecinit_expr.cpp
index 178b414..88817aa 100644
--- a/src/parsers/expr/vecinit_expr.cpp
+++ b/src/parsers/expr/vecinit_expr.cpp
@@ -34,7 +34,7 @@ void parseVecInitExprNode(VecInitExprNode *node)
     fillExprLocation(node);
     Log::dump(node);
 
-#ifdef ENABLE_CPPLANG
+#ifdef ENABLE_CXXLANG
     setPrintField(node, VEC_INIT_EXPR_IS_CONSTEXPR, isConstExpr);
 #endif
 
diff --git a/src/parsers/templateparmindex.cpp b/src/parsers/templateparmindex.cpp
index a5f6b62..211ccab 100644
--- a/src/parsers/templateparmindex.cpp
+++ b/src/parsers/templateparmindex.cpp
@@ -32,7 +32,7 @@ void parseTemplateParmIndexNode(TemplateParmIndexNode *node)
     fillType(node);
     Log::dump(node);
 
-#ifdef ENABLE_CPPLANG
+#ifdef ENABLE_CXXLANG
     setPrintField(node, TEMPLATE_PARM_IDX, parmIdx);
     setPrintField(node, TEMPLATE_PARM_LEVEL, parmLevel);
     setPrintField(node, TEMPLATE_PARM_ORIG_LEVEL, parmOrigLevel);
diff --git a/src/parsers/templatetypeparm.cpp b/src/parsers/templatetypeparm.cpp
index 46dc18b..9f0978e 100644
--- a/src/parsers/templatetypeparm.cpp
+++ b/src/parsers/templatetypeparm.cpp
@@ -32,7 +32,7 @@ void parseTemplateTypeParmNode(TemplateTypeParmNode *node)
     fillType(node);
     Log::dump(node);
 
-#ifdef ENABLE_CPPLANG
+#ifdef ENABLE_CXXLANG
     node->index = createParseNode(
         node,
         TEMPLATE_TYPE_PARM_INDEX(node->gccNode),
diff --git a/src/parsers/type/typename_type.cpp b/src/parsers/type/typename_type.cpp
index 2acb957..8439504 100644
--- a/src/parsers/type/typename_type.cpp
+++ b/src/parsers/type/typename_type.cpp
@@ -33,7 +33,7 @@ void parseTypeNameTypeNode(TypeNameTypeNode *node)
     fillType(node);
     Log::dump(node);
 
-#ifdef ENABLE_CPPLANG
+#ifdef ENABLE_CXXLANG
     setPrintField(node, TYPENAME_IS_ENUM_P, isEnum);
     setPrintField(node, TYPENAME_IS_CLASS_P, isClass);
     setPrintField(node, TYPENAME_IS_RESOLVING_P, isResolving);
@@ -42,7 +42,7 @@ void parseTypeNameTypeNode(TypeNameTypeNode *node)
     fillTypeName(node);
     fillTypeAttributes(node);
 
-#ifdef ENABLE_CPPLANG
+#ifdef ENABLE_CXXLANG
     node->fullName = createParseNode(
         node,
         TYPENAME_TYPE_FULLNAME(node->gccNode),