if (unlikely(!ops))
                return -rte_errno;
-       if (likely(!!ops->action_release)) {
+       if (likely(!!ops->tunnel_action_decap_release)) {
                return flow_err(port_id,
-                               ops->action_release(dev, actions,
-                                                   num_of_actions, error),
+                               ops->tunnel_action_decap_release(dev, actions,
+                                                                num_of_actions,
+                                                                error),
                                error);
        }
        return rte_flow_error_set(error, ENOTSUP,
 
        if (unlikely(!ops))
                return -rte_errno;
-       if (likely(!!ops->item_release)) {
+       if (likely(!!ops->tunnel_item_release)) {
                return flow_err(port_id,
-                               ops->item_release(dev, items,
-                                                 num_of_items, error),
+                               ops->tunnel_item_release(dev, items,
+                                                        num_of_items, error),
                                error);
        }
        return rte_flow_error_set(error, ENOTSUP,
 
                 struct rte_flow_restore_info *info,
                 struct rte_flow_error *err);
        /** See rte_flow_action_tunnel_decap_release() */
-       int (*action_release)
+       int (*tunnel_action_decap_release)
                (struct rte_eth_dev *dev,
                 struct rte_flow_action *pmd_actions,
                 uint32_t num_of_actions,
                 struct rte_flow_error *err);
        /** See rte_flow_item_release() */
-       int (*item_release)
+       int (*tunnel_item_release)
                (struct rte_eth_dev *dev,
                 struct rte_flow_item *pmd_items,
                 uint32_t num_of_items,