diff --git a/alib2aux/src/compare/AutomatonDiff.h b/alib2aux/src/compare/AutomatonDiff.h
index 041c45e3945c50f89f521146e6cc72b0e81bc58f..33da845d4ebf7958d81f516dc9a1de1b4b74e769 100644
--- a/alib2aux/src/compare/AutomatonDiff.h
+++ b/alib2aux/src/compare/AutomatonDiff.h
@@ -112,7 +112,7 @@ public:
 
 template<class SymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::DFA < SymbolType, StateType > & a, const automaton::DFA < SymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -149,7 +149,7 @@ void AutomatonDiff::printDiff(const automaton::DFA < SymbolType, StateType > & a
 
 template<class SymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::MultiInitialStateNFA < SymbolType, StateType > & a, const automaton::MultiInitialStateNFA < SymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -184,7 +184,7 @@ void AutomatonDiff::printDiff(const automaton::MultiInitialStateNFA < SymbolType
 
 template<class SymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::NFA < SymbolType, StateType > & a, const automaton::NFA < SymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -221,7 +221,7 @@ void AutomatonDiff::printDiff(const automaton::NFA < SymbolType, StateType > & a
 
 template<class SymbolType, class EpsilonType, class StateType>
 void AutomatonDiff::printDiff(const automaton::EpsilonNFA < SymbolType, EpsilonType, StateType > & a, const automaton::EpsilonNFA < SymbolType, EpsilonType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -258,7 +258,7 @@ void AutomatonDiff::printDiff(const automaton::EpsilonNFA < SymbolType, EpsilonT
 
 template<class SymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::ExtendedNFA < SymbolType, StateType > & a, const automaton::ExtendedNFA < SymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -295,7 +295,7 @@ void AutomatonDiff::printDiff(const automaton::ExtendedNFA < SymbolType, StateTy
 
 template<class SymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::CompactNFA < SymbolType, StateType > & a, const automaton::CompactNFA < SymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -332,7 +332,7 @@ void AutomatonDiff::printDiff(const automaton::CompactNFA < SymbolType, StateTyp
 
 template<class SymbolType, class RankType, class StateType>
 void AutomatonDiff::printDiff(const automaton::DFTA < SymbolType, RankType, StateType > & a, const automaton::DFTA < SymbolType, RankType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -361,7 +361,7 @@ void AutomatonDiff::printDiff(const automaton::DFTA < SymbolType, RankType, Stat
 
 template<class SymbolType, class RankType, class StateType>
 void AutomatonDiff::printDiff(const automaton::NFTA < SymbolType, RankType, StateType > & a, const automaton::NFTA < SymbolType, RankType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -390,7 +390,7 @@ void AutomatonDiff::printDiff(const automaton::NFTA < SymbolType, RankType, Stat
 
 template<class InputSymbolType, class EpsilonType, class PushdownStoreSymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::DPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > & a, const automaton::DPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -441,7 +441,7 @@ void AutomatonDiff::printDiff(const automaton::DPDA < InputSymbolType, EpsilonTy
 
 template<class InputSymbolType, class EpsilonType, class PushdownStoreSymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::NPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > & a, const automaton::NPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -492,7 +492,7 @@ void AutomatonDiff::printDiff(const automaton::NPDA < InputSymbolType, EpsilonTy
 
 template<class InputSymbolType, class PushdownStoreSymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::InputDrivenDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & a, const automaton::InputDrivenDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -549,7 +549,7 @@ void AutomatonDiff::printDiff(const automaton::InputDrivenDPDA < InputSymbolType
 
 template<class InputSymbolType, class PushdownStoreSymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::InputDrivenNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & a, const automaton::InputDrivenNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -606,7 +606,7 @@ void AutomatonDiff::printDiff(const automaton::InputDrivenNPDA < InputSymbolType
 
 template<class InputSymbolType, class PushdownStoreSymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::VisiblyPushdownDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & a, const automaton::VisiblyPushdownDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -681,7 +681,7 @@ void AutomatonDiff::printDiff(const automaton::VisiblyPushdownDPDA < InputSymbol
 
 template<class InputSymbolType, class PushdownStoreSymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::VisiblyPushdownNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & a, const automaton::VisiblyPushdownNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -754,7 +754,7 @@ void AutomatonDiff::printDiff(const automaton::VisiblyPushdownNPDA < InputSymbol
 
 template<class InputSymbolType, class EpsilonType, class PushdownStoreSymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::RealTimeHeightDeterministicDPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > & a, const automaton::RealTimeHeightDeterministicDPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -817,7 +817,7 @@ void AutomatonDiff::printDiff(const automaton::RealTimeHeightDeterministicDPDA <
 
 template<class InputSymbolType, class EpsilonType, class PushdownStoreSymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::RealTimeHeightDeterministicNPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > & a, const automaton::RealTimeHeightDeterministicNPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -878,7 +878,7 @@ void AutomatonDiff::printDiff(const automaton::RealTimeHeightDeterministicNPDA <
 
 template<class InputSymbolType, class EpsilonType, class PushdownStoreSymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::SinglePopDPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > & a, const automaton::SinglePopDPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -929,7 +929,7 @@ void AutomatonDiff::printDiff(const automaton::SinglePopDPDA < InputSymbolType,
 
 template<class InputSymbolType, class EpsilonType, class PushdownStoreSymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::SinglePopNPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > & a, const automaton::SinglePopNPDA < InputSymbolType, EpsilonType, PushdownStoreSymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getFinalStates() != b.getFinalStates()){
 		out << "FinalStates" << std::endl;
@@ -980,7 +980,7 @@ void AutomatonDiff::printDiff(const automaton::SinglePopNPDA < InputSymbolType,
 
 template<class SymbolType, class StateType>
 void AutomatonDiff::printDiff(const automaton::OneTapeDTM < SymbolType, StateType > & a, const automaton::OneTapeDTM < SymbolType, StateType > & b, std::ostream & out ) {
-	out << "AutomatonCompareer" << std::endl;
+	out << "AutomataComparer" << std::endl;
 
 	if(a.getBlankSymbol() != b.getBlankSymbol()) {
 		out << "Blank symbol" << std::endl;
diff --git a/alib2aux/src/compare/GrammarCompare.h b/alib2aux/src/compare/GrammarCompare.h
index 2736bd449a15930530a459f1dc5979ca10b68e79..9f125637f55a54a58fe86638bf55873cb578d1c4 100644
--- a/alib2aux/src/compare/GrammarCompare.h
+++ b/alib2aux/src/compare/GrammarCompare.h
@@ -219,7 +219,7 @@ bool GrammarCompare::testDiff(const grammar::UnrestrictedGrammar < SymbolType >
 
 template < class SymbolType >
 void GrammarCompare::printDiff(const grammar::LeftLG < SymbolType > & a, const grammar::LeftLG < SymbolType > & b, std::ostream & out ) {
-	out << "GrammarCompareer" << std::endl;
+	out << "GrammarsComparer" << std::endl;
 
 	if(a.getNonterminalAlphabet() != b.getNonterminalAlphabet()) {
 		out << "Nonterminal alphabet" << std::endl;
@@ -250,7 +250,7 @@ void GrammarCompare::printDiff(const grammar::LeftLG < SymbolType > & a, const g
 
 template < class SymbolType >
 void GrammarCompare::printDiff(const grammar::LeftRG < SymbolType > & a, const grammar::LeftRG < SymbolType > & b, std::ostream & out ) {
-	out << "GrammarCompareer" << std::endl;
+	out << "GrammarsComparer" << std::endl;
 
 	if(a.getNonterminalAlphabet() != b.getNonterminalAlphabet()) {
 		out << "Nonterminal alphabet" << std::endl;
@@ -281,7 +281,7 @@ void GrammarCompare::printDiff(const grammar::LeftRG < SymbolType > & a, const g
 
 template < class SymbolType >
 void GrammarCompare::printDiff(const grammar::RightLG < SymbolType > & a, const grammar::RightLG < SymbolType > & b, std::ostream & out ) {
-	out << "GrammarCompareer" << std::endl;
+	out << "GrammarsComparer" << std::endl;
 
 	if(a.getNonterminalAlphabet() != b.getNonterminalAlphabet()) {
 		out << "Nonterminal alphabet" << std::endl;
@@ -312,7 +312,7 @@ void GrammarCompare::printDiff(const grammar::RightLG < SymbolType > & a, const
 
 template < class SymbolType >
 void GrammarCompare::printDiff(const grammar::RightRG < SymbolType > & a, const grammar::RightRG < SymbolType > & b, std::ostream & out ) {
-	out << "GrammarCompareer" << std::endl;
+	out << "GrammarsComparer" << std::endl;
 
 	if(a.getNonterminalAlphabet() != b.getNonterminalAlphabet()) {
 		out << "Nonterminal alphabet" << std::endl;
@@ -343,7 +343,7 @@ void GrammarCompare::printDiff(const grammar::RightRG < SymbolType > & a, const
 
 template < class SymbolType >
 void GrammarCompare::printDiff(const grammar::LG < SymbolType > & a, const grammar::LG < SymbolType > & b, std::ostream & out ) {
-	out << "GrammarCompareer" << std::endl;
+	out << "GrammarsComparer" << std::endl;
 
 	if(a.getNonterminalAlphabet() != b.getNonterminalAlphabet()) {
 		out << "Nonterminal alphabet" << std::endl;
@@ -374,7 +374,7 @@ void GrammarCompare::printDiff(const grammar::LG < SymbolType > & a, const gramm
 
 template < class SymbolType >
 void GrammarCompare::printDiff(const grammar::CFG < SymbolType > & a, const grammar::CFG < SymbolType > & b, std::ostream & out ) {
-	out << "GrammarCompareer" << std::endl;
+	out << "GrammarsComparer" << std::endl;
 
 	if(a.getNonterminalAlphabet() != b.getNonterminalAlphabet()) {
 		out << "Nonterminal alphabet" << std::endl;
@@ -405,7 +405,7 @@ void GrammarCompare::printDiff(const grammar::CFG < SymbolType > & a, const gram
 
 template < class SymbolType >
 void GrammarCompare::printDiff(const grammar::EpsilonFreeCFG < SymbolType > & a, const grammar::EpsilonFreeCFG < SymbolType > & b, std::ostream & out ) {
-	out << "GrammarCompareer" << std::endl;
+	out << "GrammarsComparer" << std::endl;
 
 	if(a.getNonterminalAlphabet() != b.getNonterminalAlphabet()) {
 		out << "Nonterminal alphabet" << std::endl;
@@ -436,7 +436,7 @@ void GrammarCompare::printDiff(const grammar::EpsilonFreeCFG < SymbolType > & a,
 
 template < class SymbolType >
 void GrammarCompare::printDiff(const grammar::CNF < SymbolType > & a, const grammar::CNF < SymbolType > & b, std::ostream & out ) {
-	out << "GrammarCompareer" << std::endl;
+	out << "GrammarsComparer" << std::endl;
 
 	if(a.getNonterminalAlphabet() != b.getNonterminalAlphabet()) {
 		out << "Nonterminal alphabet" << std::endl;
@@ -467,7 +467,7 @@ void GrammarCompare::printDiff(const grammar::CNF < SymbolType > & a, const gram
 
 template < class SymbolType >
 void GrammarCompare::printDiff(const grammar::GNF < SymbolType > & a, const grammar::GNF < SymbolType > & b, std::ostream & out ) {
-	out << "GrammarCompareer" << std::endl;
+	out << "GrammarsComparer" << std::endl;
 
 	if(a.getNonterminalAlphabet() != b.getNonterminalAlphabet()) {
 		out << "Nonterminal alphabet" << std::endl;
@@ -498,7 +498,7 @@ void GrammarCompare::printDiff(const grammar::GNF < SymbolType > & a, const gram
 
 template < class SymbolType >
 void GrammarCompare::printDiff(const grammar::CSG < SymbolType > & a, const grammar::CSG < SymbolType > & b, std::ostream & out ) {
-	out << "GrammarCompareer" << std::endl;
+	out << "GrammarsComparer" << std::endl;
 
 	if(a.getNonterminalAlphabet() != b.getNonterminalAlphabet()) {
 		out << "Nonterminal alphabet" << std::endl;
@@ -529,7 +529,7 @@ void GrammarCompare::printDiff(const grammar::CSG < SymbolType > & a, const gram
 
 template < class SymbolType >
 void GrammarCompare::printDiff(const grammar::NonContractingGrammar < SymbolType > & a, const grammar::NonContractingGrammar < SymbolType > & b, std::ostream & out ) {
-	out << "GrammarCompareer" << std::endl;
+	out << "GrammarsComparer" << std::endl;
 
 	if(a.getNonterminalAlphabet() != b.getNonterminalAlphabet()) {
 		out << "Nonterminal alphabet" << std::endl;
@@ -560,7 +560,7 @@ void GrammarCompare::printDiff(const grammar::NonContractingGrammar < SymbolType
 
 template < class SymbolType >
 void GrammarCompare::printDiff(const grammar::ContextPreservingUnrestrictedGrammar < SymbolType > & a, const grammar::ContextPreservingUnrestrictedGrammar < SymbolType > & b, std::ostream & out ) {
-	out << "GrammarCompareer" << std::endl;
+	out << "GrammarsComparer" << std::endl;
 
 	if(a.getNonterminalAlphabet() != b.getNonterminalAlphabet()) {
 		out << "Nonterminal alphabet" << std::endl;
@@ -591,7 +591,7 @@ void GrammarCompare::printDiff(const grammar::ContextPreservingUnrestrictedGramm
 
 template < class SymbolType >
 void GrammarCompare::printDiff(const grammar::UnrestrictedGrammar < SymbolType > & a, const grammar::UnrestrictedGrammar < SymbolType > & b, std::ostream & out ) {
-	out << "GrammarCompareer" << std::endl;
+	out << "GrammarsComparer" << std::endl;
 
 	if(a.getNonterminalAlphabet() != b.getNonterminalAlphabet()) {
 		out << "Nonterminal alphabet" << std::endl;
diff --git a/alib2aux/src/compare/StringCompare.h b/alib2aux/src/compare/StringCompare.h
index d5b0c5bf630ddb66b255f71196156b3fbecae56c..0de4ec9afd537770fa755e3862f511f7ecf36b21 100644
--- a/alib2aux/src/compare/StringCompare.h
+++ b/alib2aux/src/compare/StringCompare.h
@@ -60,7 +60,7 @@ void StringCompare::printDiff ( const string::CyclicString < SymbolType > &, con
 
 template < class SymbolType >
 void StringCompare::printDiff ( const string::LinearString < SymbolType > & a, const string::LinearString < SymbolType > & b, std::ostream & out ) {
-	out << "StringCompare" << std::endl;
+	out << "StringsComparer" << std::endl;
 
 	if ( a.getAlphabet ( ) != b.getAlphabet ( ) ) {
 		out << "Alphabet" << std::endl;