diff --git a/alib2algo/src/automaton/FSMSingleInitialState.cpp b/alib2algo/src/automaton/FSMSingleInitialState.cpp
index 9172dece3dee9e4b3aa4fe52af5327b9a3a792e1..d9278c6e2f6a79891c8e12dd1c12b5ba86709bb5 100644
--- a/alib2algo/src/automaton/FSMSingleInitialState.cpp
+++ b/alib2algo/src/automaton/FSMSingleInitialState.cpp
@@ -89,7 +89,7 @@ void FSMSingleInitialState::Visit(void* data, const CompactNFA& automaton) const
 }
 
 void FSMSingleInitialState::Visit(void*, const DPDA&) const {
-	throw exception::AlibException("Unsupported automaton type UnknownAutomaton");
+	throw exception::AlibException("Unsupported automaton type DPDA");
 }
 
 void FSMSingleInitialState::Visit(void*, const SinglePopDPDA&) const {
diff --git a/alib2algo/src/automaton/FSMTotal.cpp b/alib2algo/src/automaton/FSMTotal.cpp
index 0f2d3cdd827efdaa5ac59e38b96070788ec7d521..584d28535a3b6a3614d236642471c59991bbecc1 100644
--- a/alib2algo/src/automaton/FSMTotal.cpp
+++ b/alib2algo/src/automaton/FSMTotal.cpp
@@ -81,7 +81,7 @@ void FSMTotal::Visit(void*, const CompactNFA&) const {
 }
 
 void FSMTotal::Visit(void*, const DPDA&) const {
-	throw exception::AlibException("Unsupported automaton type UnknownAutomaton");
+	throw exception::AlibException("Unsupported automaton type DPDA");
 }
 
 void FSMTotal::Visit(void*, const SinglePopDPDA&) const {
diff --git a/alib2algo/src/conversions/fa2rg/fa2rrg/FAtoRRGConverter.cpp b/alib2algo/src/conversions/fa2rg/fa2rrg/FAtoRRGConverter.cpp
index 83cb5e59c6c9eefbeda2cc60000f0bef3dfc9b57..6aa21c6066c54e007906e4459f6fd47c64269057 100644
--- a/alib2algo/src/conversions/fa2rg/fa2rrg/FAtoRRGConverter.cpp
+++ b/alib2algo/src/conversions/fa2rg/fa2rrg/FAtoRRGConverter.cpp
@@ -110,7 +110,7 @@ grammar::Grammar FAtoRRGConverter::convert(const automaton::Automaton& automaton
 }
 
 void FAtoRRGConverter::Visit(void*, const automaton::EpsilonNFA& ) const {
-	throw exception::AlibException("Unsupported automaton type UnknownAutomaton");
+	throw exception::AlibException("Unsupported automaton type EpsilonNFA");
 }
 
 void FAtoRRGConverter::Visit(void* data, const automaton::NFA& automaton) const {
diff --git a/alib2algo/src/determinize/vpa/VPADeterminizer.h b/alib2algo/src/determinize/vpa/VPADeterminizer.h
index f5a7dc31384c162e4fa52e7aacbf4b2dba326415..129a90f2a3bda42bb9b35007fc8cbd4234286d04 100644
--- a/alib2algo/src/determinize/vpa/VPADeterminizer.h
+++ b/alib2algo/src/determinize/vpa/VPADeterminizer.h
@@ -22,4 +22,4 @@ public:
 
 } /* namespace determinize */
 
-#endif /* VPADETERMINIZER_h_ */
+#endif /* VPADETERMINIZER_H_ */
diff --git a/astat2/src/AutomataStat.cpp b/astat2/src/AutomataStat.cpp
index 2e3a16599dfc5b74a47557837cdc292bec8f9e49..878c07bad497a6fe875981400b770394cb65ce95 100644
--- a/astat2/src/AutomataStat.cpp
+++ b/astat2/src/AutomataStat.cpp
@@ -195,7 +195,7 @@ void AutomataStat::Visit(void*, const automaton::CompactNFA&) const {
 }
 
 void AutomataStat::Visit(void*, const automaton::DPDA&) const {
-	throw exception::AlibException("Unsupported automaton type UnknownAutomaton");
+	throw exception::AlibException("Unsupported automaton type DPDAAutomaton");
 }
 
 void AutomataStat::Visit(void*, const automaton::SinglePopDPDA&) const {