   (evil-without-repeat
     (let ((pnt (point))
           (buf (current-buffer)))
-      (evil-enclose-ace-jump-for-motion
+      (evil-collection-integration-enclose-ace-jump-for-motion
         (call-interactively 'ace-jump-char-mode))
       (if (and (equal buf (current-buffer))
                (< (point) pnt))

  (evil-without-repeat
    (let ((pnt (point))
          (buf (current-buffer)))
      (evil-enclose-ace-jump-for-motion
        (call-interactively 'ace-jump-char-mode))
      ;; if we jump backwards, motion type is exclusive, analogously
      ;; to `evil-find-char-backward'


(defmacro evil-enclose-avy-for-motion (&rest body)
  "Enclose avy to make it suitable for motions.
Based on `evil-collection-integration-enclose-ace-jump-for-motion'."
  (declare (indent defun)
           (debug t))
  `(let ((avy-all-windows
