diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index dbd4563e5..6d07abdf8 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -344,6 +344,10 @@ The variable was not used in the code base.
 
 The variable was not used in the code base.
 
+*** Renamed ~org-at-property-block-p~
+
+The new name is ~org-at-property-drawer-p~, which is less confusing.
+
 *** Renamed ~org-columns-set-tags-or-toggle~
 
 See [[*~org-columns-toggle-or-columns-quit~]].
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index caaf5ce58..4a2683a6a 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -630,6 +630,9 @@ use of this function is for the stuck project list."
   (declare (obsolete "use `org-align-tags' instead." "Org 9.2"))
   (org-align-tags t))
 
+(define-obsolete-function-alias
+  'org-at-property-block-p 'org-at-property-drawer-p "Org 9.4")
+
 (defun org-flag-drawer (flag &optional element beg end)
   "When FLAG is non-nil, hide the drawer we are at.
 Otherwise make it visible.
diff --git a/lisp/org.el b/lisp/org.el
index 98496179f..bd46bd09f 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -12470,7 +12470,7 @@ FORCE is non-nil, or return nil."
 				       (line-beginning-position))))
 	      (cons pos pos)))))))
 
-(defun org-at-property-block-p ()
+(defun org-at-property-drawer-p ()
   "Non-nil when point is at the first line of a property drawer."
   (org-with-wide-buffer
    (beginning-of-line)