diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java
index 928c1d52064..9072dc31738 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java
@@ -332,7 +332,7 @@ public class LocalSessionFactoryBuilder extends Configuration {
 						}
 					}
 					catch (Throwable ex) {
-						throw new MappingException("Failed to read candidate component class: " + resource, ex);
+						throw new MappingException("Failed to read candidate entity class: " + resource, ex);
 					}
 				}
 			}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesScanner.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesScanner.java
index af2d6c68f30..3bd3a50aafa 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesScanner.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesScanner.java
@@ -161,7 +161,7 @@ public final class PersistenceManagedTypesScanner {
 					}
 				}
 				catch (Throwable ex) {
-					throw new PersistenceException("Failed to read candidate component class: " + resource, ex);
+					throw new PersistenceException("Failed to read candidate entity class: " + resource, ex);
 				}
 			}
 		}