-#define FIRST_EVENT_TIMEOUT_SEC 1
-#define EVENT_TIMEOUT_SEC 5
-#define UDEVSEND_RETRY_COUNT 50 /* x 10 millisec */
+#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