diff --git a/src/alarm_grammar.h b/src/alarm_grammar.h
index 3b0d8455146e4f86f7eed2985b5d51cfb20d7634..0ccdcfaaf03188f1fffc6a2d26c95263b18f7962 100644
--- a/src/alarm_grammar.h
+++ b/src/alarm_grammar.h
@@ -67,11 +67,11 @@
 #include "event_table.h"
 #include "formula_grammar.h"
 
-#define NAME_KEY			"name"
+#define NAME_KEY			"tag"
 #define FORMULA_KEY			"formula"
 #define ONDELAY_KEY			"on_delay"
 #define OFFDELAY_KEY		"off_delay"
-#define LEVEL_KEY			"level"
+#define LEVEL_KEY			"priority"
 #define SILENT_TIME_KEY		"silent_time"
 #define GROUP_KEY			"group"
 #define MESSAGE_KEY			"message"
@@ -83,14 +83,14 @@
 #define SHELVED_KEY			"shelved"
 #define ACKNOWLEDGED_KEY	"ack"
 #define ATTR_VALUES_KEY		"attr_values"
-#define VALUE_KEY			"value"
+#define VALUE_KEY			"state"
 #define ON_COUNTER_KEY		"on_counter"
 #define OFF_COUNTER_KEY		"off_counter"
 #define QUALITY_KEY			"quality"
 #define EXCEPTION_KEY		"exception"
 #define AUDIBLE_KEY			"audible"
 #define FREQ_COUNTER_KEY	"freq_counter"
-#define ALARM_TIME_KEY		"alarm_time"
+#define ALARM_TIME_KEY		"time"
 #define KEY(S_VAL)  		S_VAL "="
 
 #define SEP					";"