diff --git a/include/dpaddr.h b/include/dpaddr.h
index 8300729..de9d69d 100644
--- a/include/dpaddr.h
+++ b/include/dpaddr.h
@@ -129,16 +129,16 @@ typedef struct sockaddr SOCKADDR;
 # define DPNA_KEY_DEVICE               L"device"
 # define DPNA_KEY_FLOWCONTROL          L"flowcontrol"
 # define DPNA_KEY_HOSTNAME             L"hostname"
-# define DPNA_KEY_NAMEINFO_A           L"nameinfo"
+# define DPNA_KEY_NAMEINFO             L"nameinfo"
 # define DPNA_KEY_PARITY               L"parity"
 # define DPNA_KEY_PHONENUMBER          L"phonenumber"
 # define DPNA_KEY_PORT                 L"port"
-# define DPNA_KEY_PROCESSOR_A          L"processor"
+# define DPNA_KEY_PROCESSOR            L"processor"
 # define DPNA_KEY_PROGRAM              L"program"
 # define DPNA_KEY_PROVIDER             L"provider"
-# define DPNA_KEY_SCOPE_A              L"scope"
+# define DPNA_KEY_SCOPE                L"scope"
 # define DPNA_KEY_STOPBITS             L"stopbits"
-# define DPNA_KEY_TRAVERSALMODE_A      L"traversalmode"
+# define DPNA_KEY_TRAVERSALMODE        L"traversalmode"
 # define DPNA_STOP_BITS_ONE            L"1"
 # define DPNA_STOP_BITS_ONE_FIVE       L"1.5"
 # define DPNA_STOP_BITS_TWO            L"2"