From 1692f4fc3dab96401f944cbe42c6b87769e73395 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Fri, 20 Oct 2017 21:08:22 +0200
Subject: [PATCH] remove naming api

---
 aintrospection2/src/aintrospection.cpp        |  6 --
 .../src/command/NamesIntrospectionCommand.h   | 35 ----------
 alib2cli/src/parser/Parser.cpp                |  5 --
 alib2common/src/abstraction/CastRegistry.cpp  | 68 +++++--------------
 .../src/abstraction/ContainerRegistry.cpp     | 12 +---
 .../src/abstraction/ContainerRegistry.hpp     |  4 +-
 alib2common/src/abstraction/Registry.cpp      |  6 --
 alib2common/src/abstraction/Registry.h        |  2 -
 alib2common/src/core/namingApi.hpp            | 66 ------------------
 .../src/registration/NameRegistration.hpp     | 19 ------
 alib2data/src/automaton/FSM/CompactNFA.cpp    |  3 -
 alib2data/src/automaton/FSM/EpsilonNFA.cpp    |  3 -
 alib2data/src/automaton/FSM/ExtendedNFA.cpp   |  3 -
 .../automaton/FSM/MultiInitialStateNFA.cpp    |  3 -
 alib2data/src/automaton/FSM/NFA.cpp           |  3 -
 alib2data/src/automaton/PDA/DPDA.cpp          |  1 -
 .../src/automaton/PDA/InputDrivenDPDA.cpp     |  1 -
 .../src/automaton/PDA/InputDrivenNPDA.cpp     |  1 -
 alib2data/src/automaton/PDA/NPDA.cpp          |  1 -
 alib2data/src/automaton/PDA/NPDTA.cpp         |  1 -
 .../PDA/RealTimeHeightDeterministicDPDA.cpp   |  1 -
 .../PDA/RealTimeHeightDeterministicNPDA.cpp   |  1 -
 alib2data/src/automaton/PDA/SinglePopDPDA.cpp |  1 -
 alib2data/src/automaton/PDA/SinglePopNPDA.cpp |  1 -
 .../src/automaton/PDA/VisiblyPushdownDPDA.cpp |  1 -
 .../src/automaton/PDA/VisiblyPushdownNPDA.cpp |  1 -
 alib2data/src/automaton/TA/DFTA.cpp           |  1 -
 alib2data/src/automaton/TA/NFTA.cpp           |  1 -
 alib2data/src/automaton/TM/OneTapeDTM.cpp     |  1 -
 alib2data/src/grammar/ContextFree/CFG.cpp     |  1 -
 alib2data/src/grammar/ContextFree/CNF.cpp     |  1 -
 .../grammar/ContextFree/EpsilonFreeCFG.cpp    |  1 -
 alib2data/src/grammar/ContextFree/GNF.cpp     |  1 -
 alib2data/src/grammar/ContextFree/LG.cpp      |  1 -
 .../src/grammar/ContextSensitive/CSG.cpp      |  1 -
 .../NonContractingGrammar.cpp                 |  1 -
 alib2data/src/grammar/Regular/LeftLG.cpp      |  1 -
 alib2data/src/grammar/Regular/LeftRG.cpp      |  1 -
 alib2data/src/grammar/Regular/RightLG.cpp     |  1 -
 alib2data/src/grammar/Regular/RightRG.cpp     |  1 -
 .../ContextPreservingUnrestrictedGrammar.cpp  |  1 -
 .../Unrestricted/UnrestrictedGrammar.cpp      |  1 -
 alib2data/src/regexp/formal/FormalRegExp.cpp  |  3 -
 .../src/regexp/unbounded/UnboundedRegExp.cpp  |  3 -
 alib2data/src/string/CyclicString.cpp         |  1 -
 alib2data/src/string/Epsilon.cpp              |  1 -
 alib2data/src/string/LinearString.cpp         |  4 --
 .../src/tree/ranked/PostfixRankedTree.cpp     |  3 -
 .../PrefixRankedBarNonlinearPattern.cpp       |  3 -
 .../tree/ranked/PrefixRankedBarPattern.cpp    |  3 -
 .../src/tree/ranked/PrefixRankedBarTree.cpp   |  3 -
 .../ranked/PrefixRankedNonlinearPattern.cpp   |  3 -
 .../src/tree/ranked/PrefixRankedPattern.cpp   |  3 -
 .../src/tree/ranked/PrefixRankedTree.cpp      |  3 -
 .../tree/ranked/RankedNonlinearPattern.cpp    |  3 -
 alib2data/src/tree/ranked/RankedPattern.cpp   |  3 -
 alib2data/src/tree/ranked/RankedTree.cpp      |  3 -
 alib2data/src/tree/unranked/PrefixBarTree.cpp |  3 -
 .../unranked/UnrankedNonlinearPattern.cpp     |  3 -
 .../src/tree/unranked/UnrankedPattern.cpp     |  3 -
 alib2data/src/tree/unranked/UnrankedTree.cpp  |  3 -
 .../XmlContainerParserRegistry.cpp            |  8 +--
 .../XmlContainerParserRegistry.hpp            |  3 +-
 alib2xml/src/abstraction/XmlRegistry.cpp      |  2 -
 64 files changed, 22 insertions(+), 310 deletions(-)
 delete mode 100644 alib2cli/src/command/NamesIntrospectionCommand.h
 delete mode 100644 alib2common/src/core/namingApi.hpp
 delete mode 100644 alib2common/src/registration/NameRegistration.hpp

diff --git a/aintrospection2/src/aintrospection.cpp b/aintrospection2/src/aintrospection.cpp
index d45ffd8c7a..5aa9c1e45f 100644
--- a/aintrospection2/src/aintrospection.cpp
+++ b/aintrospection2/src/aintrospection.cpp
@@ -37,9 +37,6 @@ int main ( int argc, char * argv[] ) {
 		TCLAP::SwitchArg castTo ( "t", "cast_to", "Casting to type", false );
 		cmd.add ( castTo );
 
-		TCLAP::SwitchArg names ( "n", "names", "Names", false );
-		cmd.add ( names );
-
 		TCLAP::SwitchArg summary ( "s", "sumary", "Sumary", false );
 		cmd.add ( summary );
 
@@ -81,9 +78,6 @@ int main ( int argc, char * argv[] ) {
 		} else if ( castTo.isSet ( ) ) {
 			cli::Parser parser ( cli::Lexer ( "introspect casts :to #argument" ) );
 			parser.parse ( )->run ( environment );
-		} else if ( names.isSet ( ) ) {
-			cli::Parser parser ( cli::Lexer ( "introspect names" ) );
-			parser.parse ( )->run ( environment );
 		} else if ( summary.isSet ( ) ) {
 			ext::deque < sax::Token > tokens;
 
diff --git a/alib2cli/src/command/NamesIntrospectionCommand.h b/alib2cli/src/command/NamesIntrospectionCommand.h
deleted file mode 100644
index 994039a54a..0000000000
--- a/alib2cli/src/command/NamesIntrospectionCommand.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _CLI_NAME_INTROSPECTION_COMMAND_H_
-#define _CLI_NAME_INTROSPECTION_COMMAND_H_
-
-#include <command/Command.h>
-#include <environment/Environment.h>
-
-namespace cli {
-
-class NamesIntrospectionCommand : public Command {
-public:
-	void printNames ( const ext::set < ext::pair < std::string, ext::set < std::string > > > & names ) const {
-		for ( const std::pair < std::string, std::set < std::string > > & entry : names ) {
-			std::cout << entry.first << " : ";
-			bool first = true;
-			for ( const std::string & name : entry.second ) {
-				if ( first )
-					first = false;
-				else
-					std::cout << ", ";
-
-				std::cout << name;
-			}
-			std::cout << std::endl;
-		}
-	}
-
-	virtual Command::Result run ( Environment & ) const override {
-		printNames ( abstraction::Registry::listNames ( ) );
-		return Command::Result::OK;
-	}
-};
-
-} /* namespace cli */
-
-#endif /* _CLI_NAME_INTROSPECTION_COMMAND_H_ */
diff --git a/alib2cli/src/parser/Parser.cpp b/alib2cli/src/parser/Parser.cpp
index 237703f813..0b3c981271 100644
--- a/alib2cli/src/parser/Parser.cpp
+++ b/alib2cli/src/parser/Parser.cpp
@@ -28,7 +28,6 @@
 #include <command/AlgorithmsIntrospectionCommand.h>
 #include <command/OverloadsIntrospectionCommand.h>
 #include <command/DataTypesIntrospectionCommand.h>
-#include <command/NamesIntrospectionCommand.h>
 #include <command/CastsIntrospectionCommand.h>
 #include <command/SetCommand.h>
 
@@ -305,10 +304,6 @@ std::unique_ptr < Command > Parser::introspect_command ( ) {
 		std::unique_ptr < cli::Arg > param = optional_arg ( );
 		match ( cli::Lexer::TokenType::END );
 		return std::make_unique < DataTypesIntrospectionCommand > ( std::move ( param ) );
-	} else if ( check_nonreserved_kw ( "names" ) ) {
-		match_nonreserved_kw ( "names" );
-		match ( cli::Lexer::TokenType::END );
-		return std::make_unique < NamesIntrospectionCommand > ( );
 	} else if ( check_nonreserved_kw ( "casts" ) ) {
 		match_nonreserved_kw ( "casts" );
 		std::pair < bool, bool > from_to = introspect_cast_from_to ( );
diff --git a/alib2common/src/abstraction/CastRegistry.cpp b/alib2common/src/abstraction/CastRegistry.cpp
index d6f101aa33..9fabc80935 100644
--- a/alib2common/src/abstraction/CastRegistry.cpp
+++ b/alib2common/src/abstraction/CastRegistry.cpp
@@ -6,89 +6,53 @@
  */
 
 #include <abstraction/CastRegistry.hpp>
-
-#include <core/namingApi.hpp>
-
 #include <algorithm>
 
 namespace abstraction {
 
 std::shared_ptr < abstraction::OperationAbstraction > CastRegistry::getAbstraction ( const std::string & target, const std::string & param ) {
-	std::set < std::string > targetTypes;
-	if ( alib::namingApi::hasTypes ( target ) )
-		targetTypes = ext::transform < std::string > ( alib::namingApi::getTypes ( target ), [ ] ( const ext::type_index & type ) { return ext::to_string ( type ); } );
-	else
-		targetTypes.insert ( target );
-
-	for ( const std::string & toType : targetTypes ) {
-		auto cast = getEntries ( ).find ( std::make_pair ( toType, param ) );
-		if ( cast != getEntries ( ).end ( ) ) {
-			return cast->second->getAbstraction ( );
+	auto entry = getEntries ( ).end ( );
+	for ( auto iter = getEntries ( ).begin ( ); iter != getEntries ( ).end ( ); ++ iter )
+		if ( iter->first.second == param && ext::is_same_type ( target, ext::erase_template_info ( iter->first.first ) ) ) {
+			if ( entry == getEntries ( ).end ( ) )
+				entry = iter;
+			else
+				throw exception::CommonException ( "Entry from " + param + " to " + target + " is ambigous." );
 		}
-	}
 
-	throw exception::CommonException ( "Entry from " + param + " to " + target + " not available." );
+	if ( entry == getEntries ( ).end ( ) )
+		throw exception::CommonException ( "Entry from " + param + " to " + target + " not available." );
+
+	return entry->second->getAbstraction ( );
 }
 
 bool CastRegistry::isNoOp ( const std::string & target, const std::string & param ) {
-	std::set < std::string > targetTypes;
-	if ( alib::namingApi::hasTypes ( target ) )
-		targetTypes = ext::transform < std::string > ( alib::namingApi::getTypes ( target ), [ ] ( const ext::type_index & type ) { return ext::to_string ( type ); } );
-	else
-		targetTypes.insert ( target );
-
-	for ( const std::string & toType : targetTypes )
-		if ( param == toType )
-			return true;
-
-	return false;
+	return ext::erase_template_info ( param ) == ext::erase_template_info ( target );
 }
 
 bool CastRegistry::castAvailable ( const std::string & target, const std::string & param ) {
-	std::set < std::string > targetTypes;
-	if ( alib::namingApi::hasTypes ( target ) )
-		targetTypes = ext::transform < std::string > ( alib::namingApi::getTypes ( target ), [ ] ( const ext::type_index & type ) { return ext::to_string ( type ); } );
-	else
-		targetTypes.insert ( target );
-
-	for ( const std::string & toType : targetTypes ) {
-		auto cast = getEntries ( ).find ( std::make_pair ( toType, param ) );
-		if ( cast != getEntries ( ).end ( ) )
+	for ( const std::pair < const std::pair < std::string, std::string >, std::unique_ptr < Entry > > & entry : getEntries ( ) )
+		if ( entry.first.second == param && ext::is_same_type ( target, ext::erase_template_info ( entry.first.first ) ) )
 			return true;
-	}
 
 	return false;
 }
 
 ext::set < std::string > CastRegistry::listFrom ( const std::string & type ) {
-	std::set < std::string > sourceTypes;
-
-	if ( alib::namingApi::hasTypes ( type ) )
-		sourceTypes = ext::transform < std::string > ( alib::namingApi::getTypes ( type ), [ ] ( const ext::type_index & raw_type ) { return ext::to_string ( raw_type ); } );
-	else
-		sourceTypes.insert ( type );
-
 	ext::set < std::string > res;
 
 	for ( const std::pair < const std::pair < std::string, std::string >, std::unique_ptr < Entry > > & entry : getEntries ( ) )
-		if ( sourceTypes.count ( entry.first.second ) )
+		if ( ext::is_same_type ( type, ext::erase_template_info ( entry.first.second ) ) )
 			res.insert ( entry.first.first );
 
 	return res;
 }
 
 ext::set < std::string > CastRegistry::listTo ( const std::string & type ) {
-	std::set < std::string > targetTypes;
-
-	if ( alib::namingApi::hasTypes ( type ) )
-		targetTypes = ext::transform < std::string > ( alib::namingApi::getTypes ( type ), [ ] ( const ext::type_index & raw_type ) { return ext::to_string ( raw_type ); } );
-	else
-		targetTypes.insert ( type );
-
 	ext::set < std::string > res;
 
 	for ( const std::pair < const std::pair < std::string, std::string >, std::unique_ptr < Entry > > & entry : getEntries ( ) )
-		if ( targetTypes.count ( entry.first.first ) )
+		if ( ext::is_same_type ( type, ext::erase_template_info ( entry.first.first ) ) )
 			res.insert ( entry.first.second );
 
 	return res;
diff --git a/alib2common/src/abstraction/ContainerRegistry.cpp b/alib2common/src/abstraction/ContainerRegistry.cpp
index d017710736..994355077a 100644
--- a/alib2common/src/abstraction/ContainerRegistry.cpp
+++ b/alib2common/src/abstraction/ContainerRegistry.cpp
@@ -14,22 +14,16 @@ bool ContainerRegistry::hasAbstraction ( const std::string & container ) {
 	return getEntries ( ).count ( container );
 }
 
-std::shared_ptr < abstraction::OperationAbstraction > ContainerRegistry::getAbstraction ( const std::string & container, const std::string & paramType ) {
-	std::set < std::string > paramTypes;
-	if ( alib::namingApi::hasTypes ( paramType ) )
-		paramTypes = ext::transform < std::string > ( alib::namingApi::getTypes ( paramType ), [ ] ( const ext::type_index & type ) { return ext::to_string ( type ); } );
-	else
-		paramTypes.insert ( paramType );
-
+std::shared_ptr < abstraction::OperationAbstraction > ContainerRegistry::getAbstraction ( const std::string & container, const std::string & param ) {
 	auto group = getEntries ( ).find ( container );
 	if ( group == getEntries ( ).end ( ) )
 		throw exception::CommonException ( "Entry " + container + " not available" );
 
 	for ( const ext::pair < std::string, std::shared_ptr < Entry > > & entry : group->second )
-		if ( paramTypes.count ( entry.first ) )
+		if ( ext::is_same_type ( param, ext::erase_template_info ( entry.first ) ) )
 			return entry.second->getAbstraction ( );
 
-	throw exception::CommonException ( "Entry for " + container + " parametrized with " + paramType + " not available." );
+	throw exception::CommonException ( "Entry for " + container + " parametrized with " + param + " not available." );
 }
 
 ext::set < std::string > ContainerRegistry::listOverloads ( const std::string & container ) {
diff --git a/alib2common/src/abstraction/ContainerRegistry.hpp b/alib2common/src/abstraction/ContainerRegistry.hpp
index 3822153c28..62cb350dde 100644
--- a/alib2common/src/abstraction/ContainerRegistry.hpp
+++ b/alib2common/src/abstraction/ContainerRegistry.hpp
@@ -18,8 +18,6 @@
 #include <exception/CommonException.h>
 #include <abstraction/OperationAbstraction.hpp>
 
-#include <core/namingApi.hpp>
-
 namespace abstraction {
 
 class ContainerRegistry {
@@ -61,7 +59,7 @@ public:
 
 	static bool hasAbstraction ( const std::string & container );
 
-	static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & container, const std::string & paramType );
+	static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & container, const std::string & param );
 
 	static ext::set < std::string > listOverloads ( const std::string & algorithm );
 
diff --git a/alib2common/src/abstraction/Registry.cpp b/alib2common/src/abstraction/Registry.cpp
index dd5850d261..02a5d01cf9 100644
--- a/alib2common/src/abstraction/Registry.cpp
+++ b/alib2common/src/abstraction/Registry.cpp
@@ -14,8 +14,6 @@
 #include <abstraction/NormalizeRegistry.hpp>
 #include <abstraction/ContainerRegistry.hpp>
 
-#include <core/namingApi.hpp>
-
 namespace abstraction {
 
 ext::set < std::string > Registry::listAlgorithmGroup ( const std::string & group ) {
@@ -38,10 +36,6 @@ ext::set < ext::pair < std::string, std::string > > Registry::listCasts ( ) {
 	return CastRegistry::list ( );
 }
 
-ext::set < ext::pair < std::string, ext::set < std::string > > > Registry::listNames ( ) {
-	return alib::namingApi::list ( );
-}
-
 ext::set < ext::tuple < AlgorithmCategories::AlgorithmCategory, ext::pair < std::string, ext::set < abstraction::ParamQualifiers::ParamQualifier > >, ext::vector < ext::tuple < std::string, ext::set < abstraction::ParamQualifiers::ParamQualifier >, std::string > > > > Registry::listOverloads ( const std::string & algorithm ) {
 	return AlgorithmRegistry::listOverloads ( algorithm );
 }
diff --git a/alib2common/src/abstraction/Registry.h b/alib2common/src/abstraction/Registry.h
index 1793c03a31..bef140b803 100644
--- a/alib2common/src/abstraction/Registry.h
+++ b/alib2common/src/abstraction/Registry.h
@@ -28,8 +28,6 @@ public:
 
 	static ext::set < ext::tuple < AlgorithmCategories::AlgorithmCategory, ext::pair < std::string, ext::set < abstraction::ParamQualifiers::ParamQualifier > >, ext::vector < ext::tuple < std::string, ext::set < abstraction::ParamQualifiers::ParamQualifier >, std::string > > > > listOverloads ( const std::string & algorithm );
 
-	static ext::set < ext::pair < std::string, ext::set < std::string > > > listNames ( );
-
 	static std::shared_ptr < abstraction::OperationAbstraction > getContainerAbstraction ( const std::string & container, const std::string & type );
 	static std::shared_ptr < abstraction::OperationAbstraction > getAlgorithmAbstraction ( const std::string & name, const ext::vector < std::string > & paramTypes, AlgorithmCategories::AlgorithmCategory );
 	static std::shared_ptr < abstraction::OperationAbstraction > getCastAbstraction ( const std::string & target, const std::string & param );
diff --git a/alib2common/src/core/namingApi.hpp b/alib2common/src/core/namingApi.hpp
deleted file mode 100644
index 5aa707a74c..0000000000
--- a/alib2common/src/core/namingApi.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * namingApi.hpp
- *
- * Created on: Jul 7, 2017
- * Author: Jan Travnicek
- */
-
-#ifndef NAMING_API_HPP_
-#define NAMING_API_HPP_
-
-#include <map>
-#include <set>
-#include <string>
-#include <typeindex>
-
-#include <exception/CommonException.h>
-
-namespace alib {
-
-class namingApi {
-	static ext::map < std::string, ext::set < ext::type_index > > & getNames ( ) {
-		static ext::map < std::string, ext::set < ext::type_index > > names;
-		return names;
-	}
-
-public:
-	template < typename Type >
-	static void registerName ( std::string name ) {
-		ext::type_index type = ext::type_index ( typeid ( Type ) );
-		std::pair < ext::set < ext::type_index >::iterator, bool > res = getNames ( ) [ name ].insert ( type );
-		if ( ! res.second && * res.first != type )
-			throw exception::CommonException ( "Type for name " + name + " already registered.");
-	}
-
-	static ext::set < ext::type_index > & getTypes ( std::string stringname ) {
-		auto name = getNames ( ).find ( stringname );
-		if ( name == getNames ( ).end ( ) )
-			throw exception::CommonException ( "Types for name " + stringname + " not registered.");
-
-		return name->second;
-	}
-
-	static bool hasTypes ( std::string stringname ) {
-		auto name = getNames ( ).find ( stringname );
-		return name != getNames ( ).end ( );
-	}
-
-	static ext::set < ext::pair < std::string, ext::set < std::string > > > list ( ) {
-		ext::set < ext::pair < std::string, ext::set < std::string > > > res;
-
-		for ( const std::pair < const std::string, ext::set < ext::type_index > > & entry : getNames ( ) ) {
-			ext::set < std::string > names;
-			for ( const ext::type_index & name : entry.second )
-				names.insert ( ext::to_string ( name ) );
-
-			res.insert ( ext::make_pair ( entry.first, names ) );
-		}
-
-		return res;
-	}
-
-};
-
-} /* namespace alib */
-
-#endif /* CAST_API_HPP_ */
diff --git a/alib2common/src/registration/NameRegistration.hpp b/alib2common/src/registration/NameRegistration.hpp
deleted file mode 100644
index 13e8ac7475..0000000000
--- a/alib2common/src/registration/NameRegistration.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _NAME_REGISTRATION_HPP_
-#define _NAME_REGISTRATION_HPP_
-
-#include <core/namingApi.hpp>
-#include <string>
-
-namespace registration {
-
-template < class Type >
-class NameRegister {
-public:
-	NameRegister ( std::string name ) {
-		alib::namingApi::registerName < Type > ( std::move ( name ) );
-	}
-};
-
-} /* namespace registration */
-
-#endif // _NAME_REGISTRATION_HPP_
diff --git a/alib2data/src/automaton/FSM/CompactNFA.cpp b/alib2data/src/automaton/FSM/CompactNFA.cpp
index e9ca521672..714e6cee9f 100644
--- a/alib2data/src/automaton/FSM/CompactNFA.cpp
+++ b/alib2data/src/automaton/FSM/CompactNFA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -29,6 +28,4 @@ static auto compactNFAFromNFA = registration::CastRegister < automaton::CompactN
 static auto compactNFAFromMultiInitialStateNFA = registration::CastRegister < automaton::CompactNFA < >, automaton::MultiInitialStateNFA < > > ( );
 static auto compactNFAEpsilonNFA = registration::CastRegister < automaton::CompactNFA < >, automaton::EpsilonNFA < > > ( );
 
-static auto name = registration::NameRegister < automaton::CompactNFA < > > ( automaton::CompactNFA < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/automaton/FSM/EpsilonNFA.cpp b/alib2data/src/automaton/FSM/EpsilonNFA.cpp
index 37c2823922..0edf050a78 100644
--- a/alib2data/src/automaton/FSM/EpsilonNFA.cpp
+++ b/alib2data/src/automaton/FSM/EpsilonNFA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -28,6 +27,4 @@ static auto epsilonNFAFromDFA = registration::CastRegister < automaton::EpsilonN
 static auto epsilonNFAFromNFA = registration::CastRegister < automaton::EpsilonNFA < >, automaton::NFA < > > ( );
 static auto epsilonNFAFromMultiInitialStateNFA = registration::CastRegister < automaton::EpsilonNFA < >, automaton::MultiInitialStateNFA < > > ( );
 
-static auto name = registration::NameRegister < automaton::EpsilonNFA < > > ( automaton::EpsilonNFA < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/automaton/FSM/ExtendedNFA.cpp b/alib2data/src/automaton/FSM/ExtendedNFA.cpp
index 804ad8905d..4e15266a51 100644
--- a/alib2data/src/automaton/FSM/ExtendedNFA.cpp
+++ b/alib2data/src/automaton/FSM/ExtendedNFA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -30,6 +29,4 @@ static auto extendedNFAFromMultiInitialStateNFA = registration::CastRegister < a
 static auto extendedNFAEpsilonNFA = registration::CastRegister < automaton::ExtendedNFA < >, automaton::EpsilonNFA < > > ( );
 static auto extendedNFACompactNFA = registration::CastRegister < automaton::ExtendedNFA < >, automaton::CompactNFA < > > ( );
 
-static auto name = registration::NameRegister < automaton::ExtendedNFA < > > ( automaton::ExtendedNFA < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp b/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp
index 7399583d9b..26e4b030bf 100644
--- a/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp
+++ b/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -27,6 +26,4 @@ static auto xmlReaded2 = registration::XmlReaderRegister < alib::Object, automat
 static auto multiInitialStateNFAFromDFA = registration::CastRegister < automaton::MultiInitialStateNFA < >, automaton::DFA < > > ( );
 static auto multiInitialStateNFAFromNFA = registration::CastRegister < automaton::MultiInitialStateNFA < >, automaton::NFA < > > ( );
 
-static auto name = registration::NameRegister < automaton::MultiInitialStateNFA < > > ( automaton::MultiInitialStateNFA < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/automaton/FSM/NFA.cpp b/alib2data/src/automaton/FSM/NFA.cpp
index a23a5ea80e..904b100781 100644
--- a/alib2data/src/automaton/FSM/NFA.cpp
+++ b/alib2data/src/automaton/FSM/NFA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -26,6 +25,4 @@ static auto xmlReaded2 = registration::XmlReaderRegister < alib::Object, automat
 
 static auto NFAFromDFA = registration::CastRegister < automaton::NFA < >, automaton::DFA < > > ( );
 
-static auto name = registration::NameRegister < automaton::NFA < > > ( automaton::NFA < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/automaton/PDA/DPDA.cpp b/alib2data/src/automaton/PDA/DPDA.cpp
index 8c1579591b..70fb76de73 100644
--- a/alib2data/src/automaton/PDA/DPDA.cpp
+++ b/alib2data/src/automaton/PDA/DPDA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp b/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp
index ffabec3d8e..01bb24cb16 100644
--- a/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp
+++ b/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp b/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp
index 9fe18cb1e4..ec48c6d473 100644
--- a/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp
+++ b/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/automaton/PDA/NPDA.cpp b/alib2data/src/automaton/PDA/NPDA.cpp
index 2a21c815b0..ca0624b741 100644
--- a/alib2data/src/automaton/PDA/NPDA.cpp
+++ b/alib2data/src/automaton/PDA/NPDA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/automaton/PDA/NPDTA.cpp b/alib2data/src/automaton/PDA/NPDTA.cpp
index a69b902701..d1bc3fc895 100644
--- a/alib2data/src/automaton/PDA/NPDTA.cpp
+++ b/alib2data/src/automaton/PDA/NPDTA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp
index 2810a2adac..31158c7e9c 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp
index b4885eec50..90c13731cb 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/automaton/PDA/SinglePopDPDA.cpp b/alib2data/src/automaton/PDA/SinglePopDPDA.cpp
index 0b28e30d68..e7641bc50c 100644
--- a/alib2data/src/automaton/PDA/SinglePopDPDA.cpp
+++ b/alib2data/src/automaton/PDA/SinglePopDPDA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/automaton/PDA/SinglePopNPDA.cpp b/alib2data/src/automaton/PDA/SinglePopNPDA.cpp
index 2b5332c234..fae7c4660b 100644
--- a/alib2data/src/automaton/PDA/SinglePopNPDA.cpp
+++ b/alib2data/src/automaton/PDA/SinglePopNPDA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp
index 970b430b1c..c0862fb0b9 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp
index 246861a0a0..de65bfeea0 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/automaton/TA/DFTA.cpp b/alib2data/src/automaton/TA/DFTA.cpp
index 46acb95227..e03fa9fdf7 100644
--- a/alib2data/src/automaton/TA/DFTA.cpp
+++ b/alib2data/src/automaton/TA/DFTA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/automaton/TA/NFTA.cpp b/alib2data/src/automaton/TA/NFTA.cpp
index 9772259d19..d634de13cf 100644
--- a/alib2data/src/automaton/TA/NFTA.cpp
+++ b/alib2data/src/automaton/TA/NFTA.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/automaton/TM/OneTapeDTM.cpp b/alib2data/src/automaton/TM/OneTapeDTM.cpp
index 5236191bfa..403f0414f1 100644
--- a/alib2data/src/automaton/TM/OneTapeDTM.cpp
+++ b/alib2data/src/automaton/TM/OneTapeDTM.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/grammar/ContextFree/CFG.cpp b/alib2data/src/grammar/ContextFree/CFG.cpp
index 257fb04dfc..1b7deb9f03 100644
--- a/alib2data/src/grammar/ContextFree/CFG.cpp
+++ b/alib2data/src/grammar/ContextFree/CFG.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/grammar/ContextFree/CNF.cpp b/alib2data/src/grammar/ContextFree/CNF.cpp
index 37a8db100c..58a9428c21 100644
--- a/alib2data/src/grammar/ContextFree/CNF.cpp
+++ b/alib2data/src/grammar/ContextFree/CNF.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp
index 4c3ed02a8a..acd3beb409 100644
--- a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp
+++ b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/grammar/ContextFree/GNF.cpp b/alib2data/src/grammar/ContextFree/GNF.cpp
index f6e789a6db..c328a226a2 100644
--- a/alib2data/src/grammar/ContextFree/GNF.cpp
+++ b/alib2data/src/grammar/ContextFree/GNF.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/grammar/ContextFree/LG.cpp b/alib2data/src/grammar/ContextFree/LG.cpp
index e6bb144761..eaf5a5e9f1 100644
--- a/alib2data/src/grammar/ContextFree/LG.cpp
+++ b/alib2data/src/grammar/ContextFree/LG.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/grammar/ContextSensitive/CSG.cpp b/alib2data/src/grammar/ContextSensitive/CSG.cpp
index 164ca5cf35..6e8ea12366 100644
--- a/alib2data/src/grammar/ContextSensitive/CSG.cpp
+++ b/alib2data/src/grammar/ContextSensitive/CSG.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp
index 2020860f32..cf6353cfdd 100644
--- a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp
+++ b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/grammar/Regular/LeftLG.cpp b/alib2data/src/grammar/Regular/LeftLG.cpp
index bb2f2ff781..78cc2b4f62 100644
--- a/alib2data/src/grammar/Regular/LeftLG.cpp
+++ b/alib2data/src/grammar/Regular/LeftLG.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/grammar/Regular/LeftRG.cpp b/alib2data/src/grammar/Regular/LeftRG.cpp
index b20181e804..66e53dad07 100644
--- a/alib2data/src/grammar/Regular/LeftRG.cpp
+++ b/alib2data/src/grammar/Regular/LeftRG.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/grammar/Regular/RightLG.cpp b/alib2data/src/grammar/Regular/RightLG.cpp
index 984a00351f..4fb191751f 100644
--- a/alib2data/src/grammar/Regular/RightLG.cpp
+++ b/alib2data/src/grammar/Regular/RightLG.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/grammar/Regular/RightRG.cpp b/alib2data/src/grammar/Regular/RightRG.cpp
index afca72418b..2bd6477acc 100644
--- a/alib2data/src/grammar/Regular/RightRG.cpp
+++ b/alib2data/src/grammar/Regular/RightRG.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
index 208ced142d..42036faa95 100644
--- a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
+++ b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp
index 368fa468bd..e07dccf1ca 100644
--- a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp
+++ b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/regexp/formal/FormalRegExp.cpp b/alib2data/src/regexp/formal/FormalRegExp.cpp
index 0327db3f7a..0fa1f9fe0a 100644
--- a/alib2data/src/regexp/formal/FormalRegExp.cpp
+++ b/alib2data/src/regexp/formal/FormalRegExp.cpp
@@ -10,7 +10,6 @@
 #include <object/Object.h>
 
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 
@@ -18,8 +17,6 @@ namespace {
 
 static auto formalRegExpFromUnboundedRegExp = registration::CastRegister < regexp::FormalRegExp < >, regexp::UnboundedRegExp < > > ( );
 
-static auto name = registration::NameRegister < regexp::FormalRegExp < > > ( regexp::FormalRegExp < >::getXmlTagName ( ) );
-
 static auto valuePrinter = registration::ValuePrinterRegister < regexp::FormalRegExp < > > ( );
 
 static auto xmlWrite = registration::XmlWriterRegister < regexp::RegExp, regexp::FormalRegExp < > > ( );
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp b/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
index 41e6ef0fbd..27190442ef 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
@@ -10,7 +10,6 @@
 #include <object/Object.h>
 
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 
@@ -18,8 +17,6 @@ namespace {
 
 static auto unboundedRegExpFromFormalRegExp = registration::CastRegister < regexp::UnboundedRegExp < >, regexp::FormalRegExp < > > ( );
 
-static auto name = registration::NameRegister < regexp::UnboundedRegExp < > > ( regexp::UnboundedRegExp < >::getXmlTagName ( ) );
-
 static auto valuePrinter = registration::ValuePrinterRegister < regexp::UnboundedRegExp < > > ( );
 
 static auto xmlWrite = registration::XmlWriterRegister < regexp::RegExp, regexp::UnboundedRegExp < > > ( );
diff --git a/alib2data/src/string/CyclicString.cpp b/alib2data/src/string/CyclicString.cpp
index 3da718ba64..904bcaf1db 100644
--- a/alib2data/src/string/CyclicString.cpp
+++ b/alib2data/src/string/CyclicString.cpp
@@ -12,7 +12,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/string/Epsilon.cpp b/alib2data/src/string/Epsilon.cpp
index b11b673c64..bf9d6e745e 100644
--- a/alib2data/src/string/Epsilon.cpp
+++ b/alib2data/src/string/Epsilon.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
diff --git a/alib2data/src/string/LinearString.cpp b/alib2data/src/string/LinearString.cpp
index cfb0e83bf1..341e738ef4 100644
--- a/alib2data/src/string/LinearString.cpp
+++ b/alib2data/src/string/LinearString.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 #include <registration/SetRegistration.hpp>
 
 #include <container/ObjectsSet.h>
@@ -33,9 +32,6 @@ static auto LinearStringFromPrefixRankedBarTree = registration::CastRegister < s
 static auto LinearStringFromPrefixRankedBarPattern = registration::CastRegister < string::LinearString < common::ranked_symbol < > >, tree::PrefixRankedBarPattern < > > ( );
 static auto LinearStringFromPrefixRankedBarNonlinearPattern = registration::CastRegister < string::LinearString < common::ranked_symbol < > >, tree::PrefixRankedBarNonlinearPattern < > > ( );
 
-static auto LinearStringName = registration::NameRegister < string::LinearString < > > ( string::LinearString < >::getXmlTagName ( ) );
-static auto LinearStringName2 = registration::NameRegister < string::LinearString < common::ranked_symbol < > > > ( string::LinearString < >::getXmlTagName ( ) );
-
 static auto LinearStringSet = registration::SetRegister < string::LinearString < > > ( );
 
 static auto valuePrinter = registration::ValuePrinterRegister < string::LinearString < > > ( );
diff --git a/alib2data/src/tree/ranked/PostfixRankedTree.cpp b/alib2data/src/tree/ranked/PostfixRankedTree.cpp
index 9728d62177..32f6d6c42f 100644
--- a/alib2data/src/tree/ranked/PostfixRankedTree.cpp
+++ b/alib2data/src/tree/ranked/PostfixRankedTree.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -29,6 +28,4 @@ static auto xmlReaded3 = registration::XmlReaderRegister < alib::Object, tree::P
 
 static auto PostfixRankedTreeFromRankedTree = registration::CastRegister < tree::PostfixRankedTree < >, tree::RankedTree < > > ( );
 
-static auto name = registration::NameRegister < tree::PostfixRankedTree < > > ( tree::PostfixRankedTree < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.cpp b/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.cpp
index d9a2c30d23..ee7bbf70fa 100644
--- a/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -33,6 +32,4 @@ static auto PrefixRankedBarNonlinearPatternFromRankedNonlinearPattern = registra
 static auto PrefixRankedBarNonlinearPatternFromPrefixRankedBarTree = registration::CastRegister < tree::PrefixRankedBarNonlinearPattern < >, tree::PrefixRankedBarTree < > > ( );
 static auto PrefixRankedBarNonlinearPatternFromPrefixRankedBarPattern = registration::CastRegister < tree::PrefixRankedBarNonlinearPattern < >, tree::PrefixRankedBarPattern < > > ( );
 
-static auto name = registration::NameRegister < tree::PrefixRankedBarNonlinearPattern < > > ( tree::PrefixRankedBarNonlinearPattern < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp b/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp
index 3862afa776..2d06376813 100644
--- a/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -30,6 +29,4 @@ static auto xmlReaded3 = registration::XmlReaderRegister < alib::Object, tree::P
 static auto PrefixRankedBarPatternFromRankedPattern = registration::CastRegister < tree::PrefixRankedBarPattern < >, tree::RankedPattern < > > ( );
 static auto PrefixRankedBarPatternFromPrefixRankedBarTree = registration::CastRegister < tree::PrefixRankedBarPattern < >, tree::PrefixRankedBarTree < > > ( );
 
-static auto name = registration::NameRegister < tree::PrefixRankedBarPattern < > > ( tree::PrefixRankedBarPattern < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp b/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp
index f9066c2d70..d5ae307ffd 100644
--- a/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -29,6 +28,4 @@ static auto xmlReaded3 = registration::XmlReaderRegister < alib::Object, tree::P
 
 static auto PrefixRankedBarTreeFromRankedTree = registration::CastRegister < tree::PrefixRankedBarTree < >, tree::RankedTree < > > ( );
 
-static auto name = registration::NameRegister < tree::PrefixRankedBarTree < > > ( tree::PrefixRankedBarTree < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.cpp b/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.cpp
index 863c83e3b0..9efbe12b77 100644
--- a/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -33,6 +32,4 @@ static auto PrefixRankedNonlinearPatternFromRankedNonlinearPattern = registratio
 static auto PrefixRankedNonlinearPatternFromPrefixRankedTree = registration::CastRegister < tree::PrefixRankedNonlinearPattern < >, tree::PrefixRankedTree < > > ( );
 static auto PrefixRankedNonlinearPatternFromPrefixRankedPattern = registration::CastRegister < tree::PrefixRankedNonlinearPattern < >, tree::PrefixRankedPattern < > > ( );
 
-static auto name = registration::NameRegister < tree::PrefixRankedNonlinearPattern < > > ( tree::PrefixRankedNonlinearPattern < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/tree/ranked/PrefixRankedPattern.cpp b/alib2data/src/tree/ranked/PrefixRankedPattern.cpp
index 9a78d43ce7..b7a54ea3d5 100644
--- a/alib2data/src/tree/ranked/PrefixRankedPattern.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedPattern.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -30,6 +29,4 @@ static auto xmlReaded3 = registration::XmlReaderRegister < alib::Object, tree::P
 static auto PrefixRankedPatternFromRankedPattern = registration::CastRegister < tree::PrefixRankedPattern < >, tree::RankedPattern < > > ( );
 static auto PrefixRankedPatternFromPrefixRankedTree = registration::CastRegister < tree::PrefixRankedPattern < >, tree::PrefixRankedTree < > > ( );
 
-static auto name = registration::NameRegister < tree::PrefixRankedPattern < > > ( tree::PrefixRankedPattern < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/tree/ranked/PrefixRankedTree.cpp b/alib2data/src/tree/ranked/PrefixRankedTree.cpp
index 8c2fa12c81..12b58ea5ff 100644
--- a/alib2data/src/tree/ranked/PrefixRankedTree.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedTree.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -29,6 +28,4 @@ static auto xmlReaded3 = registration::XmlReaderRegister < alib::Object, tree::P
 
 static auto PrefixRankedTreeFromRankedTree = registration::CastRegister < tree::PrefixRankedTree < >, tree::RankedTree < > > ( );
 
-static auto name = registration::NameRegister < tree::PrefixRankedTree < > > ( tree::PrefixRankedTree < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/tree/ranked/RankedNonlinearPattern.cpp b/alib2data/src/tree/ranked/RankedNonlinearPattern.cpp
index b5de7d4fda..197127ae41 100644
--- a/alib2data/src/tree/ranked/RankedNonlinearPattern.cpp
+++ b/alib2data/src/tree/ranked/RankedNonlinearPattern.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -27,6 +26,4 @@ static auto xmlReader = registration::XmlReaderRegister < tree::Tree, tree::Rank
 static auto xmlReaded2 = registration::XmlReaderRegister < tree::RankedTreeWrapper, tree::RankedNonlinearPattern < > > ( );
 static auto xmlReaded3 = registration::XmlReaderRegister < alib::Object, tree::RankedNonlinearPattern < > > ( );
 
-static auto name = registration::NameRegister < tree::RankedNonlinearPattern < > > ( tree::RankedNonlinearPattern < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/tree/ranked/RankedPattern.cpp b/alib2data/src/tree/ranked/RankedPattern.cpp
index ce2f28c5b7..ebf8c282c6 100644
--- a/alib2data/src/tree/ranked/RankedPattern.cpp
+++ b/alib2data/src/tree/ranked/RankedPattern.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -29,6 +28,4 @@ static auto xmlReaded3 = registration::XmlReaderRegister < alib::Object, tree::R
 
 static auto RankedPatternFromUnrankedPattern = registration::CastRegister < tree::RankedPattern < >, tree::UnrankedPattern < > > ( );
 
-static auto name = registration::NameRegister < tree::RankedPattern < > > ( tree::RankedPattern < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/tree/ranked/RankedTree.cpp b/alib2data/src/tree/ranked/RankedTree.cpp
index 7928779e03..692341566b 100644
--- a/alib2data/src/tree/ranked/RankedTree.cpp
+++ b/alib2data/src/tree/ranked/RankedTree.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -30,6 +29,4 @@ static auto xmlReaded3 = registration::XmlReaderRegister < alib::Object, tree::R
 static auto RankedTreeFromUnrankedTree = registration::CastRegister < tree::RankedTree < >, tree::UnrankedTree < > > ( );
 static auto RankedTreeFromPostfixRankedTree = registration::CastRegister < tree::RankedTree < >, tree::PostfixRankedTree < > > ( );
 
-static auto name = registration::NameRegister < tree::RankedTree < > > ( tree::RankedTree < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/tree/unranked/PrefixBarTree.cpp b/alib2data/src/tree/unranked/PrefixBarTree.cpp
index 43208bc99b..52e45756ab 100644
--- a/alib2data/src/tree/unranked/PrefixBarTree.cpp
+++ b/alib2data/src/tree/unranked/PrefixBarTree.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -29,6 +28,4 @@ static auto xmlReaded3 = registration::XmlReaderRegister < alib::Object, tree::P
 
 static auto PrefixBarTreeFromUnrankedTree = registration::CastRegister < tree::PrefixBarTree < >, tree::UnrankedTree < > > ( );
 
-static auto name = registration::NameRegister < tree::PrefixBarTree < > > ( tree::PrefixBarTree < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/tree/unranked/UnrankedNonlinearPattern.cpp b/alib2data/src/tree/unranked/UnrankedNonlinearPattern.cpp
index 34d57f5361..c46db0367c 100644
--- a/alib2data/src/tree/unranked/UnrankedNonlinearPattern.cpp
+++ b/alib2data/src/tree/unranked/UnrankedNonlinearPattern.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -27,6 +26,4 @@ static auto xmlReader = registration::XmlReaderRegister < tree::Tree, tree::Unra
 static auto xmlReaded2 = registration::XmlReaderRegister < tree::UnrankedTreeWrapper, tree::UnrankedNonlinearPattern < > > ( );
 static auto xmlReaded3 = registration::XmlReaderRegister < alib::Object, tree::UnrankedNonlinearPattern < > > ( );
 
-static auto name = registration::NameRegister < tree::UnrankedNonlinearPattern < > > ( tree::UnrankedNonlinearPattern < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/tree/unranked/UnrankedPattern.cpp b/alib2data/src/tree/unranked/UnrankedPattern.cpp
index b31b26112f..57de3ffbe0 100644
--- a/alib2data/src/tree/unranked/UnrankedPattern.cpp
+++ b/alib2data/src/tree/unranked/UnrankedPattern.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -29,6 +28,4 @@ static auto xmlReaded3 = registration::XmlReaderRegister < alib::Object, tree::U
 
 static auto UnrankedPatternFromRankedPattern = registration::CastRegister < tree::UnrankedPattern < >, tree::RankedPattern < > > ( );
 
-static auto name = registration::NameRegister < tree::UnrankedPattern < > > ( tree::UnrankedPattern < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2data/src/tree/unranked/UnrankedTree.cpp b/alib2data/src/tree/unranked/UnrankedTree.cpp
index f60a54e7bb..5e7f635d54 100644
--- a/alib2data/src/tree/unranked/UnrankedTree.cpp
+++ b/alib2data/src/tree/unranked/UnrankedTree.cpp
@@ -13,7 +13,6 @@
 #include <registration/ValuePrinterRegistration.hpp>
 #include <registration/XmlRegistration.hpp>
 #include <registration/CastRegistration.hpp>
-#include <registration/NameRegistration.hpp>
 
 namespace {
 
@@ -29,6 +28,4 @@ static auto xmlReaded3 = registration::XmlReaderRegister < alib::Object, tree::U
 
 static auto UnrankedTreeFromRankedTree = registration::CastRegister < tree::UnrankedTree < >, tree::RankedTree < > > ( );
 
-static auto name = registration::NameRegister < tree::UnrankedTree < > > ( tree::UnrankedTree < >::getXmlTagName ( ) );
-
 } /* namespace */
diff --git a/alib2xml/src/abstraction/XmlContainerParserRegistry.cpp b/alib2xml/src/abstraction/XmlContainerParserRegistry.cpp
index 13bb83ee36..04a0749e8c 100644
--- a/alib2xml/src/abstraction/XmlContainerParserRegistry.cpp
+++ b/alib2xml/src/abstraction/XmlContainerParserRegistry.cpp
@@ -15,18 +15,12 @@ bool XmlContainerParserRegistry::hasAbstraction ( const std::string & container
 }
 
 std::shared_ptr < abstraction::OperationAbstraction > XmlContainerParserRegistry::getAbstraction ( const std::string & container, const std::string & type ) {
-	std::set < std::string > paramTypes;
-	if ( alib::namingApi::hasTypes ( type ) )
-		paramTypes = ext::transform < std::string > ( alib::namingApi::getTypes ( type ), [ ] ( const ext::type_index & theType ) { return ext::to_string ( theType ); } );
-	else
-		paramTypes.insert ( type );
-
 	auto group = getEntries ( ).find ( container );
 	if ( group == getEntries ( ).end ( ) )
 		throw exception::CommonException ( "Entry " + container + " not available" );
 
 	for ( const ext::pair < std::string, std::shared_ptr < Entry > > & entry : group->second )
-		if ( paramTypes.count ( entry.first ) )
+		if ( ext::is_same_type ( type, ext::erase_template_info ( entry.first ) ) )
 			return entry.second->getAbstraction ( );
 
 	throw exception::CommonException ( "Entry for " + container + " parametrized with " + type + " not available." );
diff --git a/alib2xml/src/abstraction/XmlContainerParserRegistry.hpp b/alib2xml/src/abstraction/XmlContainerParserRegistry.hpp
index a3dcd1e722..31b385bb70 100644
--- a/alib2xml/src/abstraction/XmlContainerParserRegistry.hpp
+++ b/alib2xml/src/abstraction/XmlContainerParserRegistry.hpp
@@ -13,12 +13,11 @@
 #include <vector>
 #include <string>
 #include <set>
+#include <map>
 
 #include <exception/CommonException.h>
 #include <abstraction/OperationAbstraction.hpp>
 
-#include <core/namingApi.hpp>
-
 namespace abstraction {
 
 class XmlContainerParserRegistry {
diff --git a/alib2xml/src/abstraction/XmlRegistry.cpp b/alib2xml/src/abstraction/XmlRegistry.cpp
index 9ed877748f..b4076f57e1 100644
--- a/alib2xml/src/abstraction/XmlRegistry.cpp
+++ b/alib2xml/src/abstraction/XmlRegistry.cpp
@@ -16,8 +16,6 @@
 #include <abstraction/XmlTokensComposerAbstraction.hpp>
 #include <abstraction/XmlTokensParserAbstraction.hpp>
 
-#include <core/namingApi.hpp>
-
 namespace abstraction {
 
 ext::set < std::string > XmlRegistry::listDataTypes ( ) {
-- 
GitLab