} __packed;
 
 /* Attributes for peer get/set operations */
-#define DME_ATTR_SELECTOR_INDEX                        0
+#define DME_ATTR_SELECTOR_INDEX_NULL           0
 /* FIXME: remove ES2 support and DME_ATTR_T_TST_SRC_INCREMENT */
 #define DME_ATTR_T_TST_SRC_INCREMENT           0x4083
 #define DME_ATTR_ES3_INIT_STATUS               0x6101
 
                attr = DME_ATTR_ES3_INIT_STATUS;
 
        ret = gb_svc_dme_peer_get(hd->svc, intf->interface_id, attr,
-                                 DME_ATTR_SELECTOR_INDEX, &value);
+                                 DME_ATTR_SELECTOR_INDEX_NULL, &value);
        if (ret)
                return ret;
 
 
        /* Clear the init status. */
        return gb_svc_dme_peer_set(hd->svc, intf->interface_id, attr,
-                                  DME_ATTR_SELECTOR_INDEX, 0);
+                                  DME_ATTR_SELECTOR_INDEX_NULL, 0);
 }
 
 /* interface sysfs attributes */