diff --git a/site/docs/skylark/macros.md b/site/docs/skylark/macros.md
index 77821982875586..b8a2dc56517917 100644
--- a/site/docs/skylark/macros.md
+++ b/site/docs/skylark/macros.md
@@ -24,7 +24,7 @@ def my_macro(name, visibility=None):
 ```
 
 If you need to know the package name (i.e. which BUILD file is calling the
-macro), use the constant [PACKAGE_NAME](lib/globals.html#PACKAGE_NAME).
+macro), use the function [native.package_name()](lib/native.html#package_name).
 
 ## Examples
 
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java b/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java
index 4c2b10dea8b634..4b5230b8bdcf77 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java
@@ -97,7 +97,8 @@ public void repr(SkylarkPrinter printer) {
   public static final NoneType NONE = new NoneType();
 
   @SkylarkSignature(name = "PACKAGE_NAME", returnType = String.class,
-      doc = "The name of the package being evaluated. "
+      doc = "<b>Deprecated. Use <a href=\"native.html#package_name\">package_name()</a> "
+          + "instead.</b> The name of the package being evaluated. "
           + "For example, in the BUILD file <code>some/package/BUILD</code>, its value "
           + "will be <code>some/package</code>. "
           + "If the BUILD file calls a function defined in a .bzl file, PACKAGE_NAME will "
@@ -117,7 +118,8 @@ public void repr(SkylarkPrinter printer) {
   public static final String PKG_NAME = "PACKAGE_NAME";
 
   @SkylarkSignature(name = "REPOSITORY_NAME", returnType = String.class,
-      doc = "The name of the repository the rule or build extension is called from. "
+      doc = "<b>Deprecated. Use <a href=\"native.html#repository_name\">repository_name()</a> "
+          + "instead.</b> The name of the repository the rule or build extension is called from. "
           + "For example, in packages that are called into existence by the WORKSPACE stanza "
           + "<code>local_repository(name='local', path=...)</code> it will be set to "
           + "<code>@local</code>. In packages in the main repository, it will be empty. "