Index: src/Actions/Makefile.am
===================================================================
--- src/Actions/Makefile.am	(revision 07a47e0c167bba50906b5cc3e9289ec6e7f1c6db)
+++ src/Actions/Makefile.am	(revision 41d023ff8dc20a2b26d06e7c4960972918c6e500)
@@ -229,15 +229,15 @@
 PARSERACTIONSOURCE = \
   Actions/ParserAction/ParseTremoloPotentialsAction.cpp \
-  Actions/ParserAction/SetMpqcParametersAction.cpp \
+  Actions/ParserAction/SetParserParametersAction.cpp \
   Actions/ParserAction/SetOutputFormatsAction.cpp \
   Actions/ParserAction/SetTremoloAtomdataAction.cpp
 PARSERACTIONHEADER = \
   Actions/ParserAction/ParseTremoloPotentialsAction.hpp \
-  Actions/ParserAction/SetMpqcParametersAction.hpp \
+  Actions/ParserAction/SetParserParametersAction.hpp \
   Actions/ParserAction/SetOutputFormatsAction.hpp \
   Actions/ParserAction/SetTremoloAtomdataAction.hpp
 PARSERACTIONDEFS = \
   Actions/ParserAction/ParseTremoloPotentialsAction.def \
-  Actions/ParserAction/SetMpqcParametersAction.def \
+  Actions/ParserAction/SetParserParametersAction.def \
   Actions/ParserAction/SetOutputFormatsAction.def \
   Actions/ParserAction/SetTremoloAtomdataAction.def
Index: src/Actions/ParserAction/SetMpqcParametersAction.cpp
===================================================================
--- src/Actions/ParserAction/SetMpqcParametersAction.cpp	(revision 07a47e0c167bba50906b5cc3e9289ec6e7f1c6db)
+++ 	(revision )
@@ -1,79 +1,0 @@
-/*
- * Project: MoleCuilder
- * Description: creates and alters molecular systems
- * Copyright (C)  2010 University of Bonn. All rights reserved.
- * Please see the LICENSE file or "Copyright notice" in builder.cpp for details.
- */
-
-/*
- * SetMpqcParametersAction.cpp
- *
- *  Created on: May 8, 2010
- *      Author: heber
- */
-
-// include config.h
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "CodePatterns/MemDebug.hpp"
-
-#include "CodePatterns/Log.hpp"
-#include "CodePatterns/Verbose.hpp"
-#include "Parser/FormatParserStorage.hpp"
-#include "Parser/MpqcParser.hpp"
-#include "Parser/MpqcParser_Parameters.hpp"
-
-#include <iostream>
-#include <string>
-
-#include "SetMpqcParametersAction.hpp"
-
-using namespace MoleCuilder;
-
-// and construct the stuff
-#include "SetMpqcParametersAction.def"
-#include "Action_impl_pre.hpp"
-/** =========== define the function ====================== */
-Action::state_ptr ParserSetMpqcParametersAction::performCall() {
-  MpqcParser_Parameters &parser = FormatParserStorage::getInstance().getParser<mpqc>().getParams();
-
-  std::stringstream oldparamstream;
-  oldparamstream << parser;
-  // obtain information
-  getParametersfromValueStorage();
-  std::stringstream newparamstream(params.newparams);
-  newparamstream >> parser;
-
-  return Action::state_ptr(new ParserSetMpqcParametersState(oldparamstream.str(), params));
-}
-
-Action::state_ptr ParserSetMpqcParametersAction::performUndo(Action::state_ptr _state) {
-  ParserSetMpqcParametersState *state = assert_cast<ParserSetMpqcParametersState*>(_state.get());
-
-  MpqcParser_Parameters &parser = FormatParserStorage::getInstance().getParser<mpqc>().getParams();
-  std::stringstream oldparamstream(state->oldparams);
-  oldparamstream >> parser;
-
-  return Action::state_ptr(_state);
-}
-
-Action::state_ptr ParserSetMpqcParametersAction::performRedo(Action::state_ptr _state){
-  ParserSetMpqcParametersState *state = assert_cast<ParserSetMpqcParametersState*>(_state.get());
-
-  MpqcParser_Parameters &parser = FormatParserStorage::getInstance().getParser<mpqc>().getParams();
-  std::stringstream newparamstream(state->params.newparams);
-  newparamstream >> parser;
-
-  return Action::state_ptr(_state);
-}
-
-bool ParserSetMpqcParametersAction::canUndo() {
-  return true;
-}
-
-bool ParserSetMpqcParametersAction::shouldUndo() {
-  return true;
-}
-/** =========== end of function ====================== */
Index: src/Actions/ParserAction/SetMpqcParametersAction.def
===================================================================
--- src/Actions/ParserAction/SetMpqcParametersAction.def	(revision 07a47e0c167bba50906b5cc3e9289ec6e7f1c6db)
+++ 	(revision )
@@ -1,33 +1,0 @@
-/*
- * SetMpqcParametersAction.def
- *
- *  Created on: Aug 26, 2010
- *      Author: heber
- */
-
-// all includes and forward declarations necessary for non-integral types below
-
-
-// i.e. there is an integer with variable name Z that can be found in
-// ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
-#define paramtypes (std::string)
-#define paramtokens ("set-mpqc-parameters")
-#define paramdescriptions ("parameter (key = value;) assignment for MPQC")
-#undef paramdefaults
-#define paramreferences (newparams)
-
-#define statetypes (std::string)
-#define statereferences (oldparams)
-
-// some defines for all the names, you may use ACTION, STATE and PARAMS
-#define CATEGORY Parser
-#define MENUNAME "parser"
-#define MENUPOSITION 11
-#define ACTIONNAME SetMpqcParameters
-#define TOKEN "set-mpqc-parameters"
-
-
-// finally the information stored in the ActionTrait specialization
-#define DESCRIPTION "set the parameters for MPQC"
-#define SHORTFORM "M"
Index: src/Actions/ParserAction/SetMpqcParametersAction.hpp
===================================================================
--- src/Actions/ParserAction/SetMpqcParametersAction.hpp	(revision 07a47e0c167bba50906b5cc3e9289ec6e7f1c6db)
+++ 	(revision )
@@ -1,22 +1,0 @@
-/*
- * SetMpqcParametersAction.hpp
- *
- *  Created on: May 8, 2010
- *      Author: heber
- */
-
-#ifndef SETMPQCPARAMETERSACTION_HPP_
-#define SETMPQCPARAMETERSACTION_HPP_
-
-// include config.h
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
-#include "Actions/Action.hpp"
-
-#include "SetMpqcParametersAction.def"
-#include "Action_impl_header.hpp"
-
-#endif /* SETMPQCPARAMETERSACTION_HPP_ */
Index: src/Actions/ParserAction/SetParserParametersAction.cpp
===================================================================
--- src/Actions/ParserAction/SetParserParametersAction.cpp	(revision 41d023ff8dc20a2b26d06e7c4960972918c6e500)
+++ src/Actions/ParserAction/SetParserParametersAction.cpp	(revision 41d023ff8dc20a2b26d06e7c4960972918c6e500)
@@ -0,0 +1,90 @@
+/*
+ * Project: MoleCuilder
+ * Description: creates and alters molecular systems
+ * Copyright (C)  2010 University of Bonn. All rights reserved.
+ * Please see the LICENSE file or "Copyright notice" in builder.cpp for details.
+ */
+
+/*
+ * SetParserParametersAction.cpp
+ *
+ *  Created on: May 8, 2010
+ *      Author: heber
+ */
+
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "CodePatterns/MemDebug.hpp"
+
+#include "CodePatterns/Log.hpp"
+#include "CodePatterns/Verbose.hpp"
+#include "Parser/FormatParserStorage.hpp"
+#include "Parser/MpqcParser.hpp"
+#include "Parser/MpqcParser_Parameters.hpp"
+#include "Actions/ValueStorage.hpp"
+
+#include <iostream>
+#include <string>
+
+#include "SetParserParametersAction.hpp"
+
+using namespace MoleCuilder;
+
+// and construct the stuff
+#include "SetParserParametersAction.def"
+#include "Action_impl_pre.hpp"
+/** =========== define the function ====================== */
+Action::state_ptr ParserSetParserParametersAction::performCall() {
+  // get parameters
+  getParametersfromValueStorage();
+
+  // get parser
+  ParserTypes type = FormatParserStorage::getInstance().getTypeFromName(params.parsername);
+  FormatParser_Parameters *parameters = FormatParserStorage::getInstance().get(type).parameters;
+  ASSERT(parameters != NULL,
+      "ParserSetParserParametersAction::performCall() - parameters of parser is NULL.");
+
+  // obtain undo state
+  std::stringstream oldparamstream;
+  oldparamstream << *parameters;
+
+  // obtain information
+  std::stringstream newparamstream(params.newparams);
+  newparamstream >> *parameters;
+
+  return Action::state_ptr(new ParserSetParserParametersState(oldparamstream.str(), params));
+}
+
+Action::state_ptr ParserSetParserParametersAction::performUndo(Action::state_ptr _state) {
+  ParserSetParserParametersState *state = assert_cast<ParserSetParserParametersState*>(_state.get());
+
+  ParserTypes type = FormatParserStorage::getInstance().getTypeFromName(state->params.parsername);
+  FormatParser_Parameters *parser = FormatParserStorage::getInstance().get(type).parameters;
+  std::stringstream oldparamstream(state->oldparams);
+  oldparamstream >> *parser;
+
+  return Action::state_ptr(_state);
+}
+
+Action::state_ptr ParserSetParserParametersAction::performRedo(Action::state_ptr _state){
+  ParserSetParserParametersState *state = assert_cast<ParserSetParserParametersState*>(_state.get());
+
+  ParserTypes type = FormatParserStorage::getInstance().getTypeFromName(state->params.parsername);
+  FormatParser_Parameters *parser = FormatParserStorage::getInstance().get(type).parameters;
+  std::stringstream newparamstream(state->params.newparams);
+  newparamstream >> *parser;
+
+  return Action::state_ptr(_state);
+}
+
+bool ParserSetParserParametersAction::canUndo() {
+  return true;
+}
+
+bool ParserSetParserParametersAction::shouldUndo() {
+  return true;
+}
+/** =========== end of function ====================== */
Index: src/Actions/ParserAction/SetParserParametersAction.def
===================================================================
--- src/Actions/ParserAction/SetParserParametersAction.def	(revision 41d023ff8dc20a2b26d06e7c4960972918c6e500)
+++ src/Actions/ParserAction/SetParserParametersAction.def	(revision 41d023ff8dc20a2b26d06e7c4960972918c6e500)
@@ -0,0 +1,33 @@
+/*
+ * SetParserParametersAction.def
+ *
+ *  Created on: Aug 26, 2010
+ *      Author: heber
+ */
+
+// all includes and forward declarations necessary for non-integral types below
+
+
+// i.e. there is an integer with variable name Z that can be found in
+// ValueStorage by the token "Z" -> first column: int, Z, "Z"
+// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+#define paramtypes (std::string)(std::string)
+#define paramtokens ("set-parser-parameters")("parser-parameters")
+#define paramdescriptions ("name of the parser to change")("parameter (key = value;)")
+#define paramdefaults (NODEFAULT)(NODEFAULT)
+#define paramreferences (parsername)(newparams)
+
+#define statetypes (std::string)
+#define statereferences (oldparams)
+
+// some defines for all the names, you may use ACTION, STATE and PARAMS
+#define CATEGORY Parser
+#define MENUNAME "parser"
+#define MENUPOSITION 11
+#define ACTIONNAME SetParserParameters
+#define TOKEN "set-parser-parameters"
+
+
+// finally the information stored in the ActionTrait specialization
+#define DESCRIPTION "set the parameters for a given parser"
+#define SHORTFORM "M"
Index: src/Actions/ParserAction/SetParserParametersAction.hpp
===================================================================
--- src/Actions/ParserAction/SetParserParametersAction.hpp	(revision 41d023ff8dc20a2b26d06e7c4960972918c6e500)
+++ src/Actions/ParserAction/SetParserParametersAction.hpp	(revision 41d023ff8dc20a2b26d06e7c4960972918c6e500)
@@ -0,0 +1,22 @@
+/*
+ * SetParserParametersAction.hpp
+ *
+ *  Created on: May 8, 2010
+ *      Author: heber
+ */
+
+#ifndef SETPARSERPARAMETERSACTION_HPP_
+#define SETPARSERPARAMETERSACTION_HPP_
+
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+
+#include "Actions/Action.hpp"
+
+#include "SetParserParametersAction.def"
+#include "Action_impl_header.hpp"
+
+#endif /* SETPARSERPARAMETERSACTION_HPP_ */
