diff --git a/src/Alarm.cpp b/src/Alarm.cpp
index bd604ab7798854d86d7dd533303c79e0bc5c959a..6823e919eae748f949041e999708a70c857ab824 100644
--- a/src/Alarm.cpp
+++ b/src/Alarm.cpp
@@ -2310,6 +2310,7 @@ void Alarm::load_alarm(string alarm_string, alarm_t &alm, vector<string> &evn)
     	if(!alm.name.empty())
     	{
     		alm.attr_name = alm.name;
+#if 0
 			size_t start_pos = 0;
 			string from("/");
 			string to("__");
@@ -2318,6 +2319,7 @@ void Alarm::load_alarm(string alarm_string, alarm_t &alm, vector<string> &evn)
 				alm.attr_name.replace(start_pos, from.length(), to);
 				start_pos += to.length(); // In case 'to' contains 'from', like replacing 'x' with 'yx'
 			}
+#endif
     	}
     	//std::transform(alm.formula.begin(), alm.formula.end(), alm.formula.begin(), (int(*)(int))tolower);		//transform to lowercase: incorrect, state has to be written uppercase
     	std::transform(alm.lev.begin(), alm.lev.end(), alm.lev.begin(), (int(*)(int))tolower);		//transform to lowercase
diff --git a/src/alarm_grammar.h b/src/alarm_grammar.h
index 0b2a57825c077a9169ea6959232ed6b593252636..fd9806c72919465a0ff70187e4b44dfa1cb64759 100644
--- a/src/alarm_grammar.h
+++ b/src/alarm_grammar.h
@@ -177,7 +177,7 @@ struct alarm_parse : public grammar<alarm_parse>
             expression
             	=	discard_node_d
             		[
-            		name
+            		name_alm
             			[
             				assign_a(self.m_alarm.name)			//save name in alarm_t
 						]