diff --git a/build-spring-framework/resources/changelog.txt b/build-spring-framework/resources/changelog.txt
index 7b7db88e59..ad89788712 100644
--- a/build-spring-framework/resources/changelog.txt
+++ b/build-spring-framework/resources/changelog.txt
@@ -12,8 +12,8 @@ Changes in version 3.1 M1 (2011-02-11)
 * introduced support for environment profiles in bean definition files
 * introduced PropertySourcesPlaceholderConfigurer as alternative to PropertyPlaceholderConfigurer
 * introduced "c:" namespace for constructor argument shortcuts (analogous to the "p:" namespace)
-* introduced @FeatureConfiguration classes with @Feature methods returns FeatureSpecifications
-* added TxAnnotationDriven and MvcAnnotationDriven etc as out of the box FeatureSpecifications
+* introduced @FeatureConfiguration classes with @Feature methods that return FeatureSpecifications
+* added TxAnnotationDriven, MvcAnnotationDriven, etc. as out-of-the-box FeatureSpecifications
 * introduced caching abstraction and cache annotation support
 * ProxyCreationContext uses "ThreadLocal.remove()" over "ThreadLocal.set(null)" as well
 * fixed potential InjectionMetadata NPE when using SpringBeanAutowiringInterceptor
@@ -22,7 +22,7 @@ Changes in version 3.1 M1 (2011-02-11)
 * Servlet/PortletRequestDataBinder perform unwrapping for MultipartRequest as well
 * ResourceHttpRequestHandler does not set Content-Length header for 304 response
 * LocaleChangeInterceptor validates locale values in order to prevent XSS vulnerability
-
+* BeanDefinitionVisitor now actually visits factory method names
 
 Changes in version 3.0.5 (2010-10-20)
 -------------------------------------
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java
index f18fa848b3..be2f8b4f4a 100644
--- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java
+++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java
@@ -123,8 +123,8 @@ public interface BeanDefinition extends AttributeAccessor, BeanMetadataElement {
 	/**
 	 * Specify a factory method, if any. This method will be invoked with
 	 * constructor arguments, or with no arguments if none are specified.
-	 * The method will be invoked on the specifed factory bean, if any,
-	 * or as static method on the local bean class else.
+	 * The method will be invoked on the specified factory bean, if any,
+	 * or otherwise as a static method on the local bean class.
 	 * @param factoryMethodName static factory method name,
 	 * or <code>null</code> if normal constructor creation should be used
 	 * @see #getBeanClassName()
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionVisitor.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionVisitor.java
index eb49eb7b02..6869566c17 100644
--- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionVisitor.java
+++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionVisitor.java
@@ -115,7 +115,7 @@ public class BeanDefinitionVisitor {
 	}
 
 	protected void visitFactoryMethodName(BeanDefinition beanDefinition) {
-		String factoryMethodName = beanDefinition.getFactoryBeanName();
+		String factoryMethodName = beanDefinition.getFactoryMethodName();
 		if (factoryMethodName != null) {
 			String resolvedName = resolveStringValue(factoryMethodName);
 			if (!factoryMethodName.equals(resolvedName)) {