#define KVTML_LICENSE "license"
#define KVTML_COMMENT "comment"
-#define KVTML_IDS "identifiers"
-#define KVTML_ID "identifier"
+#define KVTML_IDENTIFIERS "identifiers"
+#define KVTML_IDENTIFIER "identifier"
#define KVTML_TYPE "type"
-#define KVTML_LOCALE "twoalpha"
+#define KVTML_LOCALE "locale"
#define KVTML_NAME "name"
#define KVTML_SIZEHINT "sizehint"
#define KVTML_ARTICLE "article"
-#define KVTML_DEF "definite"
-#define KVTML_INDEF "indefinite"
+#define KVTML_DEFINITE "definite"
+#define KVTML_INDEFINITE "indefinite"
#define KVTML_MALE "male"
-#define KVTML_FEM "female"
-#define KVTML_NEU "neutral"
-#define KVTML_CONJ "conjugation"
-#define KVTML_SING "singular"
-#define KVTML_PLU "plural"
+#define KVTML_FEMALE "female"
+#define KVTML_NEUTRAL "neutral"
+#define KVTML_CONJUGATION "conjugation"
+#define KVTML_SINGULAR "singular"
+#define KVTML_PLURAL "plural"
#define KVTML_TYPES "types"