diff --git a/lisp/obarray.el b/lisp/obarray.el
index fb7a333b8b5..0e57381a9c5 100644
--- a/lisp/obarray.el
+++ b/lisp/obarray.el
@@ -57,7 +57,7 @@ Creates and adds the symbol if doesn't exist."
 Return t on success, nil otherwise."
   (unintern name obarray))
 
-(defun obarray-foreach (fn obarray)
+(defun obarray-map (fn obarray)
   "Call function FN on every symbol in OBARRAY and return nil."
   (mapatoms fn obarray))
 
diff --git a/test/automated/obarray-tests.el b/test/automated/obarray-tests.el
index 16ed694bb3f..97df3b3b6a6 100644
--- a/test/automated/obarray-tests.el
+++ b/test/automated/obarray-tests.el
@@ -73,17 +73,17 @@
     (should (obarray-remove table "aoeu"))
     (should-not (obarray-get table "aoeu"))))
 
-(ert-deftest obarray-foreach-test ()
+(ert-deftest obarray-map-test ()
   "Should execute function on all elements of obarray."
   (let* ((table (obarray-make 3))
          (syms '())
          (collect-names (lambda (sym) (push (symbol-name sym) syms))))
-    (obarray-foreach collect-names table)
+    (obarray-map collect-names table)
     (should (null syms))
     (obarray-put table "a")
     (obarray-put table "b")
     (obarray-put table "c")
-    (obarray-foreach collect-names table)
+    (obarray-map collect-names table)
     (should (equal (sort syms #'string<) '("a" "b" "c")))))
 
 (provide 'obarray-tests)