diff --git a/alib2data/src/automaton/AutomatonFromXMLParser.cpp b/alib2data/src/automaton/AutomatonFromXMLParser.cpp
index 0e0a5564b09ab2ade6c3aecba6f92094596b6c9a..16ed26b1cbbbcc46f5ecb217790288db4d859fed 100644
--- a/alib2data/src/automaton/AutomatonFromXMLParser.cpp
+++ b/alib2data/src/automaton/AutomatonFromXMLParser.cpp
@@ -311,8 +311,8 @@ VisiblyPushdownNPDA AutomatonFromXMLParser::parseVisiblyPushdownNPDA(std::list<s
 	VisiblyPushdownNPDA automaton(bottomOfTheStackSymbol);
 	automaton.setStates(states);
 	automaton.setCallInputSymbols(callInputSymbols);
-	automaton.setReturnInputSymbols(callInputSymbols);
-	automaton.setLocalInputSymbols(callInputSymbols);
+	automaton.setReturnInputSymbols(returnInputSymbols);
+	automaton.setLocalInputSymbols(localInputSymbols);
 	automaton.setReturnInputSymbols(returnInputSymbols);
 	automaton.setLocalInputSymbols(localInputSymbols);
 	automaton.setStackSymbols(stackSymbols);
diff --git a/alib2data/src/automaton/AutomatonToXMLComposer.cpp b/alib2data/src/automaton/AutomatonToXMLComposer.cpp
index 1cd4bb121d71f34355da324de03f90e82b3d1379..b2ec69661159f5477d81b462978c976868779851 100644
--- a/alib2data/src/automaton/AutomatonToXMLComposer.cpp
+++ b/alib2data/src/automaton/AutomatonToXMLComposer.cpp
@@ -310,7 +310,7 @@ void AutomatonToXMLComposer::composeTransitions(std::list<sax::Token>& out, cons
 			composeTransitionTo(out, target.first);
 			composeTransitionSinglePush(out, target.second);
 
-			out.push_back(sax::Token("calltransition", sax::Token::TokenType::END_ELEMENT));
+			out.push_back(sax::Token("callTransition", sax::Token::TokenType::END_ELEMENT));
 		}
 	}
 	for(const auto& transition : automaton.getReturnTransitions()) {
@@ -322,7 +322,7 @@ void AutomatonToXMLComposer::composeTransitions(std::list<sax::Token>& out, cons
 			composeTransitionSinglePop(out, std::get<2>(transition.first));
 			composeTransitionTo(out, target);
 
-			out.push_back(sax::Token("returntransition", sax::Token::TokenType::END_ELEMENT));
+			out.push_back(sax::Token("returnTransition", sax::Token::TokenType::END_ELEMENT));
 		}
 	}
 	for(const auto& transition : automaton.getLocalTransitions()) {
@@ -333,7 +333,7 @@ void AutomatonToXMLComposer::composeTransitions(std::list<sax::Token>& out, cons
 			composeTransitionInputSymbol(out, transition.first.second);
 			composeTransitionTo(out, target);
 
-			out.push_back(sax::Token("localtransition", sax::Token::TokenType::END_ELEMENT));
+			out.push_back(sax::Token("localTransition", sax::Token::TokenType::END_ELEMENT));
 		}
 	}