diff --git a/alib2data/src/regexp/formal/FormalRegExpEmpty.h b/alib2data/src/regexp/formal/FormalRegExpEmpty.h
index 44796c4af0b6b47849565501f0dfd97a85ddb2bf..17d7461f5ce058911c1c60a5040da851c0e23eba 100644
--- a/alib2data/src/regexp/formal/FormalRegExpEmpty.h
+++ b/alib2data/src/regexp/formal/FormalRegExpEmpty.h
@@ -16,7 +16,7 @@ namespace regexp {
 /**
  * Represents empty regular expression in the regular expression.
  */
-class FormalRegExpEmpty : public FormalRegExpElement, public std::NularyNode < std::smart_ptr < FormalRegExpElement >, std::smart_ptr < const FormalRegExpElement >, FormalRegExpSymbol > {
+class FormalRegExpEmpty : public FormalRegExpElement, public std::NullaryNode < std::smart_ptr < FormalRegExpElement >, std::smart_ptr < const FormalRegExpElement >, FormalRegExpSymbol > {
 public:
 	void Accept ( void * userData, const FormalRegExpElementVisitor & visitor ) const {
 		visitor.Visit ( userData, * this );
diff --git a/alib2data/src/regexp/formal/FormalRegExpEpsilon.h b/alib2data/src/regexp/formal/FormalRegExpEpsilon.h
index 65f81947013f5290c8da81a8de91d203fd7257f8..e758ec00e23642b9f31bef37a5c159567ed5285a 100644
--- a/alib2data/src/regexp/formal/FormalRegExpEpsilon.h
+++ b/alib2data/src/regexp/formal/FormalRegExpEpsilon.h
@@ -16,7 +16,7 @@ namespace regexp {
 /**
  * Represents epsilon in the regular expression.
  */
-class FormalRegExpEpsilon : public FormalRegExpElement, public std::NularyNode < std::smart_ptr < FormalRegExpElement >, std::smart_ptr < const FormalRegExpElement >, FormalRegExpSymbol > {
+class FormalRegExpEpsilon : public FormalRegExpElement, public std::NullaryNode < std::smart_ptr < FormalRegExpElement >, std::smart_ptr < const FormalRegExpElement >, FormalRegExpSymbol > {
 public:
 	void Accept ( void * userData, const FormalRegExpElementVisitor & visitor ) const {
 		visitor.Visit ( userData, * this );
diff --git a/alib2data/src/regexp/formal/FormalRegExpSymbol.h b/alib2data/src/regexp/formal/FormalRegExpSymbol.h
index 57b232ad0b95b85776c7d9084b35005b2650c20b..04f8a32702bb75d2a2cf0351c69eda2ed5e3dd9a 100644
--- a/alib2data/src/regexp/formal/FormalRegExpSymbol.h
+++ b/alib2data/src/regexp/formal/FormalRegExpSymbol.h
@@ -16,7 +16,7 @@ namespace regexp {
 /**
  * Represents symbol in the regular expression. Contains name of the symbol.
  */
-class FormalRegExpSymbol : public FormalRegExpElement, public std::NularyNode < std::smart_ptr < FormalRegExpElement >, std::smart_ptr < const FormalRegExpElement >, FormalRegExpSymbol > {
+class FormalRegExpSymbol : public FormalRegExpElement, public std::NullaryNode < std::smart_ptr < FormalRegExpElement >, std::smart_ptr < const FormalRegExpElement >, FormalRegExpSymbol > {
 	alphabet::Symbol symbol;
 
 public:
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.h b/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.h
index c5ee0d84943e40b7b28ff5229970c5754f1ab1e2..879d149d9573a6efba7d6d611c3a4713539c0b62 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.h
@@ -15,7 +15,7 @@ namespace regexp {
 /**
  * Represents empty regular expression in the regular expression.
  */
-class UnboundedRegExpEmpty : public UnboundedRegExpElement, public std::NularyNode < std::smart_ptr < UnboundedRegExpElement >, std::smart_ptr < const UnboundedRegExpElement >, UnboundedRegExpSymbol > {
+class UnboundedRegExpEmpty : public UnboundedRegExpElement, public std::NullaryNode < std::smart_ptr < UnboundedRegExpElement >, std::smart_ptr < const UnboundedRegExpElement >, UnboundedRegExpSymbol > {
 public:
 	void Accept ( void * userData, const UnboundedRegExpElementVisitor & visitor ) const {
 		visitor.Visit ( userData, * this );
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.h b/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.h
index 45d66c998ef3cf88da4f515e19c5861437ac5543..b3937f1619eac3a65f5382ff73ea4bc2d7b6ea6e 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.h
@@ -15,7 +15,7 @@ namespace regexp {
 /**
  * Represents epsilon in the regular expression.
  */
-class UnboundedRegExpEpsilon : public UnboundedRegExpElement, public std::NularyNode < std::smart_ptr < UnboundedRegExpElement >, std::smart_ptr < const UnboundedRegExpElement >, UnboundedRegExpSymbol > {
+class UnboundedRegExpEpsilon : public UnboundedRegExpElement, public std::NullaryNode < std::smart_ptr < UnboundedRegExpElement >, std::smart_ptr < const UnboundedRegExpElement >, UnboundedRegExpSymbol > {
 public:
 	void Accept ( void * userData, const UnboundedRegExpElementVisitor & visitor ) const {
 		visitor.Visit ( userData, * this );
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h b/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h
index 844412f67abf734eac20fd390eb68f32e0061a09..288b4a7bf05a67aa976974011889094e6bcd2d2c 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h
@@ -16,7 +16,7 @@ namespace regexp {
 /**
  * Represents symbol in the regular expression. Contains name of the symbol.
  */
-class UnboundedRegExpSymbol : public UnboundedRegExpElement, public std::NularyNode < std::smart_ptr < UnboundedRegExpElement >, std::smart_ptr < const UnboundedRegExpElement >, UnboundedRegExpSymbol > {
+class UnboundedRegExpSymbol : public UnboundedRegExpElement, public std::NullaryNode < std::smart_ptr < UnboundedRegExpElement >, std::smart_ptr < const UnboundedRegExpElement >, UnboundedRegExpSymbol > {
 	alphabet::Symbol symbol;
 
 public:
diff --git a/alib2std/src/extensions/tree.hpp b/alib2std/src/extensions/tree.hpp
index e165ef6774ae3c877de213f39c3e14d2af447969..a66cd6d5ef5d95d7050f7ea54da897ebd0cd1503 100644
--- a/alib2std/src/extensions/tree.hpp
+++ b/alib2std/src/extensions/tree.hpp
@@ -15,7 +15,7 @@ class BaseNode {
 	Data * parent;
 
 	template < class D, class CD, class C >
-	friend class NularyNode;
+	friend class NullaryNode;
 	template < class D, class CD, class C >
 	friend class UnaryNode;
 	template < class D, class CD, class C >
@@ -135,9 +135,9 @@ public:
 };
 
 template < class Data, class ConstData = Data, class Cast = Data >
-class NularyNode : public AnyaryNode < Data, 0, ConstData, Cast > {
+class NullaryNode : public AnyaryNode < Data, 0, ConstData, Cast > {
 public:
-	NularyNode ( ) : AnyaryNode < Data, 0, ConstData, Cast > ( std::tuple < > ( ) ) {
+	NullaryNode ( ) : AnyaryNode < Data, 0, ConstData, Cast > ( std::tuple < > ( ) ) {
 	}
 
 };
diff --git a/alib2std/test-src/extensions/TreeTest.h b/alib2std/test-src/extensions/TreeTest.h
index 80a10e4413734ea4c5c48710ac5f41f71a3c169e..41c6695f6d24528bc702c54a2632127f829a1e18 100644
--- a/alib2std/test-src/extensions/TreeTest.h
+++ b/alib2std/test-src/extensions/TreeTest.h
@@ -33,7 +33,7 @@ public:
 
 	};
 
-	class RegExpSymbol : public RegExpElement, public std::NularyNode < std::shared_ptr < RegExpElement >, std::shared_ptr < const RegExpElement >, RegExpSymbol > {
+	class RegExpSymbol : public RegExpElement, public std::NullaryNode < std::shared_ptr < RegExpElement >, std::shared_ptr < const RegExpElement >, RegExpSymbol > {
 		char symbol;
 
 	public: