diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd
index 814a63c7036..68ffbf9ce9c 100644
--- a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd
+++ b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd
@@ -87,7 +87,9 @@
 	* profile="default" means that beans will be registered unless other profile(s) are active
 	* profile="xyz,default" means that beans will be registered if 'xyz' is active or if no profile is active
 	* ConfigurableEnvironment.setDefaultProfileName(String) customizes the name of the default profile
-	* 'defaultSpringProfile' property customizes the name of the default profile (usually for use as a
+	* 'spring.profile.default' property customizes the name of the default profile (usually for use as a
+	* ConfigurableEnvironment.setActiveProfiles(String...) sets which profiles are active
+	* 'spring.profile.active' sets which profiles are active (typically as a -D system property)
 	  servlet context/init param)
 					]]></xsd:documentation>
 				</xsd:annotation>
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/Profile.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/Profile.java
index b3192d3d2fe..744463556da 100644
--- a/org.springframework.context/src/main/java/org/springframework/context/annotation/Profile.java
+++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/Profile.java
@@ -30,9 +30,9 @@ import java.lang.annotation.Target;
  * @Profile("default") means that beans will be registered unless other profile(s) are active
  * @Profile({"xyz,default"}) means that beans will be registered if 'xyz' is active or if no profile is active
  * ConfigurableEnvironment.setDefaultProfileName(String) customizes the name of the default profile
- * 'defaultSpringProfile' property customizes the name of the default profile (usually for use as a servlet context/init param)
+ * 'spring.profile.default' property customizes the name of the default profile (usually for use as a servlet context/init param)
  * ConfigurableEnvironment.setActiveProfiles(String...) sets which profiles are active
- * 'springProfiles' sets which profiles are active (typically as a -D system property)
+ * 'spring.profile.active' sets which profiles are active (typically as a -D system property)
  *
  * @author Chris Beams
  * @since 3.1
diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/AbstractEnvironment.java b/org.springframework.core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
index dd463a34c3f..dbabdf77b99 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
@@ -50,9 +50,9 @@ import org.springframework.util.PropertyPlaceholderHelper.PlaceholderResolver;
  */
 public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 
-	public static final String ACTIVE_PROFILES_PROPERTY_NAME = "springProfiles";
+	public static final String ACTIVE_PROFILES_PROPERTY_NAME = "spring.profile.active";
 
-	public static final String DEFAULT_PROFILE_PROPERTY_NAME = "defaultSpringProfile";
+	public static final String DEFAULT_PROFILE_PROPERTY_NAME = "spring.profile.default";
 
 	/**
 	 * Default name of the default profile. Override with
@@ -293,9 +293,9 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 	}
 
 	public String getDefaultProfile() {
-		String defaultSpringProfileProperty = getProperty(DEFAULT_PROFILE_PROPERTY_NAME);
-		if (defaultSpringProfileProperty != null) {
-			return defaultSpringProfileProperty;
+		String defaultProfileProperty = getProperty(DEFAULT_PROFILE_PROPERTY_NAME);
+		if (defaultProfileProperty != null) {
+			return defaultProfileProperty;
 		}
 		return defaultProfile;
 	}