-#define UDEV_EXEC "./udev"
-#define UDEVD_EXEC "./udevd"
-#define UDEVD_TIMEOUT_SECONDS 60
-#define EVENT_TIMEOUT_SECONDS 5
-
-#define IPC_KEY_ID 0
-#define HOTPLUGMSGTYPE 44
+#define UDEV_MAGIC "udevd_" UDEV_VERSION
+#define EVENT_TIMEOUT_SEC 10
+#define UDEVD_SOCK_PATH "udevd"
+#define SEND_WAIT_MAX_SECONDS 3
+#define SEND_WAIT_LOOP_PER_SECOND 10