diff --git a/src/libhydra/attributes/attributes.c b/src/libhydra/attributes/attributes.c
index d8490b7f5..9fabcf4e4 100644
--- a/src/libhydra/attributes/attributes.c
+++ b/src/libhydra/attributes/attributes.c
@@ -87,28 +87,28 @@ ENUM_BEGIN(configuration_attribute_type_short_names, INTERNAL_IP4_ADDRESS, HOME_
 	"HOA");
 ENUM_NEXT(configuration_attribute_type_short_names, XAUTH_TYPE, XAUTH_ANSWER, HOME_AGENT_ADDRESS,
 	"X_TYPE",
-	"X_USER_NAME",
-	"X_USER_PASSWORD",
-	"X_PASSCODE",
-	"X_MESSAGE",
-	"X_CHALLENGE",
+	"X_USER",
+	"X_PWD",
+	"X_CODE",
+	"X_MSG",
+	"X_CHALL",
 	"X_DOMAIN",
 	"X_STATUS",
-	"X_NEXT_PIN",
+	"X_PIN",
 	"X_ANSWER");
 ENUM_NEXT(configuration_attribute_type_short_names, INTERNAL_IP4_SERVER, INTERNAL_IP6_SERVER, XAUTH_ANSWER,
 	"SRV",
 	"SRV6");
 ENUM_NEXT(configuration_attribute_type_short_names, UNITY_BANNER, UNITY_DDNS_HOSTNAME, INTERNAL_IP6_SERVER,
 	"U_BANNER",
-	"U_SAVE_PASSWD",
-	"U_DEF_DOMAIN",
-	"U_SPLITDNS_NAME",
-	"U_SPLIT_INCLUDE",
-	"U_NATT_PORT",
-	"U_LOCAL_LAN",
+	"U_SAVEPWD",
+	"U_DEFDOM",
+	"U_SPLITDNS",
+	"U_SPLITINC",
+	"U_NATTPORT",
+	"U_LOCALLAN",
 	"U_PFS",
-	"U_FW_TYPE",
-	"U_BACKUP_SERVERS",
-	"U_DDNS_HOSTNAME");
+	"U_FWTYPE",
+	"U_BKPSRV",
+	"U_DDNSHOST");
 ENUM_END(configuration_attribute_type_short_names, UNITY_DDNS_HOSTNAME);