diff --git a/docs/configuration.md b/docs/configuration.md
index fc7923818..7b590a2a6 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -54,13 +54,17 @@ If you are adding new options, prefer adding them to `ConfigModule`.
 **`RegistryConfig`** is an interface, of which you write an implementing class
 containing the configuration values. `RegistryConfigLoader` is the class that
 provides the instance of `RegistryConfig`, and defaults to returning
-`ProductionRegistryConfigExample`. In order to create a configuration specific
-to your registry, we recommend copying the `ProductionRegistryConfigExample`
-class to a new class that will not be shared publicly, setting the
-`com.google.domain.registry.config` system property in `appengine-web.xml` to
-the fully qualified class name of that new class so that `RegistryConfigLoader`
-will load it instead, and then editing said new class to add your specific
-configuration options.
+`ProductionRegistryConfigExample`.
+
+In order to create a configuration specific to your registry, we recommend
+copying the `ProductionRegistryConfigExample` class to a new class that will not
+be shared publicly, setting the `google.registry.config` system property in the
+`appengine-web.xml` files to the fully qualified class name of that new class
+so that `RegistryConfigLoader` will load it instead, and then editing said new
+class to add your specific configuration options. There is one
+`appengine-web.xml` file per service (so three per environment). The same
+configuration class must be used for each service, but different ones can be
+used for different environments.
 
 The `RegistryConfig` class has documentation on all of the methods that should
 be sufficient to explain what each option is, and
diff --git a/java/google/registry/config/RegistryConfigLoader.java b/java/google/registry/config/RegistryConfigLoader.java
index 61383d230..bec4a7765 100644
--- a/java/google/registry/config/RegistryConfigLoader.java
+++ b/java/google/registry/config/RegistryConfigLoader.java
@@ -30,7 +30,7 @@ import javax.annotation.concurrent.ThreadSafe;
 @ThreadSafe
 public final class RegistryConfigLoader {
 
-  public static final String REGISTRY_CONFIG_PROPERTY = "com.google.domain.registry.config";
+  public static final String REGISTRY_CONFIG_PROPERTY = "google.registry.config";
   public static final String REGISTRY_CONFIG_DEFAULT =
       "google.registry.config.ProductionRegistryConfigExample";