diff --git a/src/alarm_grammar.h b/src/alarm_grammar.h
index 0ccdcfaaf03188f1fffc6a2d26c95263b18f7962..1617057952108330abc83aea85363561caaa2e14 100644
--- a/src/alarm_grammar.h
+++ b/src/alarm_grammar.h
@@ -79,13 +79,14 @@
 #define OFF_COMMAND_KEY		"off_command"
 #define ENABLED_KEY			"enabled"
 
-#define SILENT_TIME_REMAINING_KEY		"silent_time_remaining"
+#define SILENT_TIME_REMAINING_KEY		"shlvd_end"
 #define SHELVED_KEY			"shelved"
 #define ACKNOWLEDGED_KEY	"ack"
-#define ATTR_VALUES_KEY		"attr_values"
+#define ATTR_VALUES_KEY		"values"
 #define VALUE_KEY			"state"
 #define ON_COUNTER_KEY		"on_counter"
 #define OFF_COUNTER_KEY		"off_counter"
+#define COUNTER_KEY			"counter"
 #define QUALITY_KEY			"quality"
 #define EXCEPTION_KEY		"exception"
 #define AUDIBLE_KEY			"audible"