&cipher_xform, params.session_priv_mpool);
                TEST_ASSERT_SUCCESS(ret, "Failed to init session\n");
 
-               ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID,
-                                                       evdev, &cap);
+               ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID,
+                                                       &cap);
                TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
                if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA) {
        uint32_t cap;
        int ret;
 
-       ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap);
+       ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap);
        TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
        if (!(cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) &&
        uint32_t cap;
        int ret;
 
-       ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap);
+       ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap);
        TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
        if (!(cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) &&
                                params.session_mpool);
                TEST_ASSERT_NOT_NULL(sess, "Session creation failed\n");
 
-               ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID,
-                                                       evdev, &cap);
+               ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID,
+                                                       &cap);
                TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
                if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA) {
        uint32_t cap;
        int ret;
 
-       ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap);
+       ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap);
        TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
        if (!(cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) &&
        uint32_t cap;
        int ret;
 
-       ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap);
+       ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap);
        TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
        if (!(cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) &&
 
        /* Create adapter with default port creation callback */
        ret = rte_event_crypto_adapter_create(TEST_ADAPTER_ID,
-                                             TEST_CDEV_ID,
+                                             evdev,
                                              &conf, 0);
        TEST_ASSERT_SUCCESS(ret, "Failed to create event crypto adapter\n");
 
        uint32_t cap;
        int ret;
 
-       ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap);
+       ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap);
        TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
        if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) {