diff --git a/README.org b/README.org
index 0a6ba9c..7746a88 100644
--- a/README.org
+++ b/README.org
@@ -62,7 +62,7 @@ and ~cl-defmethod~.
 
 ** License
 
-See [[file:COPYING][COPYING]]. Copyright (c) 2018-2023 Damien Cassou.
+See [[file:COPYING][COPYING]]. Copyright (c) 2018-2025 Damien Cassou.
 
 #+BEGIN_HTML
 <a href="https://liberapay.com/DamienCassou/donate">
diff --git a/libmpdel-directory.el b/libmpdel-directory.el
index 2a91efc..847f3c4 100644
--- a/libmpdel-directory.el
+++ b/libmpdel-directory.el
@@ -1,11 +1,11 @@
 ;;; libmpdel-directory.el --- Handling directories  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2019-2023  Damien Cassou
+;; Copyright (C) 2019-2025  Damien Cassou
 
 ;; Author: Jose A Ortega <jao@gnu.org>
 ;; Keywords: multimedia
-;; Url: https://github.com/mpdel/libmpdel
-;; Package-requires: ((emacs "25.1"))
+;; URL: https://github.com/mpdel/libmpdel
+;; Package-Requires: ((emacs "25.1"))
 ;; Version: 1.2.0
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/libmpdel.el b/libmpdel.el
index fe0ec15..5db54ba 100644
--- a/libmpdel.el
+++ b/libmpdel.el
@@ -1,11 +1,11 @@
 ;;; libmpdel.el --- Communication with an MPD server  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2023  Damien Cassou
+;; Copyright (C) 2017-2025  Damien Cassou
 
 ;; Author: Damien Cassou <damien@cassou.me>
 ;; Keywords: multimedia
-;; Url: https://github.com/mpdel/libmpdel
-;; Package-requires: ((emacs "25.1"))
+;; URL: https://github.com/mpdel/libmpdel
+;; Package-Requires: ((emacs "25.1"))
 ;; Version: 2.0.0
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -685,9 +685,9 @@ directly on the completion candidates (such as embark)."
                                                    (funcall #'libmpdel-entity-name entity)
                                                    'libmpdel-entity entity))
                                  entities)))
-    (cl-mapcar (lambda (entity entity-string)
-                 (puthash entity-string entity map))
-               entities entity-strings)
+    (cl-loop for entity in entities
+             for entity-string in entity-strings
+             do (puthash entity-string entity map))
     (let ((entity-string (completing-read prompt
                                           (lambda (string predicate action)
                                             (if (eq action 'metadata)
diff --git a/test/libmpdel-directory-test.el b/test/libmpdel-directory-test.el
index 0b495ef..f4f8b3f 100644
--- a/test/libmpdel-directory-test.el
+++ b/test/libmpdel-directory-test.el
@@ -1,10 +1,10 @@
 ;;; libmpdel-directory-test.el --- Tests for libmpdel.el        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2019-2023  Damien Cassou
+;; Copyright (C) 2019-2025  Damien Cassou
 
 ;; Author: Jose A Ortega <jao@gnu.org>
-;; Url: https://github.com/mpdel/mpdel
-;; Package-requires: ((emacs "25.1"))
+;; URL: https://github.com/mpdel/mpdel
+;; Package-Requires: ((emacs "25.1"))
 ;; Version: 1.2.0
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/test/libmpdel-test.el b/test/libmpdel-test.el
index a1f0d7d..0edad04 100644
--- a/test/libmpdel-test.el
+++ b/test/libmpdel-test.el
@@ -1,10 +1,10 @@
 ;;; libmpdel-test.el --- Tests for libmpdel.el        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2023  Damien Cassou
+;; Copyright (C) 2017-2025  Damien Cassou
 
 ;; Author: Damien Cassou <damien@cassou.me>
-;; Url: https://github.com/mpdel/mpdel
-;; Package-requires: ((emacs "25.1"))
+;; URL: https://github.com/mpdel/mpdel
+;; Package-Requires: ((emacs "25.1"))
 ;; Version: 1.2.0
 
 ;; This program is free software; you can redistribute it and/or modify