diff --git a/alib2data/src/Api.hpp b/alib2data/src/Api.hpp
index 093ef63e93a5c198c68a6d5c15c77bc9f4c5a8c4..f457f162c46cb163d92dffca8861d01fe546ccfa 100644
--- a/alib2data/src/Api.hpp
+++ b/alib2data/src/Api.hpp
@@ -314,7 +314,7 @@ struct api<string::Epsilon> {
 	static std::list<sax::Token> compose(const string::Epsilon& data);
 };
 
-}
+} /* namespace alib */
 
 #include "container/ContainerFromXMLParser.hpp"
 
diff --git a/alib2data/src/container/Container.h b/alib2data/src/container/Container.h
index 3577d661e0d9686dab8733f783623d39a28226cd..990f111cb5309e8fb00e64ced2988097fcade744 100644
--- a/alib2data/src/container/Container.h
+++ b/alib2data/src/container/Container.h
@@ -2,7 +2,7 @@
  * Container.h
  *
  *  Created on: Apr 10, 2013
- *      Author: Martin Zak
+ *      Author: Jan Travnicek
  */
 
 #ifndef CONTAINER_H_
@@ -15,7 +15,7 @@
 namespace container {
 
 /**
- * Wrapper around automata.
+ * Wrapper around containers.
  */
 typedef alib::wrapper<ContainerBase> Container;
 
diff --git a/alib2data/src/container/ContainerBase.h b/alib2data/src/container/ContainerBase.h
index 8d0057fccd0dfedd9a3b47f365493e1bcfe764ab..d5818e6385fa3ae3bd410318a043ab5be6ec1b42 100644
--- a/alib2data/src/container/ContainerBase.h
+++ b/alib2data/src/container/ContainerBase.h
@@ -14,7 +14,7 @@
 namespace container {
 
 /**
- * Represents symbol in an container.
+ * Represents container in a hierarchy.
  */
 class ContainerBase : public alib::ObjectBase {
 public:
diff --git a/alib2data/src/container/ContainerFromXMLParser.cpp b/alib2data/src/container/ContainerFromXMLParser.cpp
index 2164e1363da2a9b732bc7460a286f4fb62df92f7..a5643ae6ef3052ee52e21c826702d2257bf9ddd2 100644
--- a/alib2data/src/container/ContainerFromXMLParser.cpp
+++ b/alib2data/src/container/ContainerFromXMLParser.cpp
@@ -44,5 +44,5 @@ ObjectsSet ContainerFromXMLParser::parseObjectsSet(std::list<sax::Token>& input)
 	return set;
 }
 
-} /* namespace automaton */
+} /* namespace container */