diff --git a/orm/src/main/java/org/hibernate/tool/ide/completion/ConfigurationCompletion.java b/orm/src/main/java/org/hibernate/tool/ide/completion/ConfigurationCompletion.java
index 9e165ab56c..1d545f99e9 100644
--- a/orm/src/main/java/org/hibernate/tool/ide/completion/ConfigurationCompletion.java
+++ b/orm/src/main/java/org/hibernate/tool/ide/completion/ConfigurationCompletion.java
@@ -298,7 +298,7 @@ private Value getNextAttributeType(Component t, String attributeName) {
         if (idx != -1) {
             attributeName = attributeName.substring(0, idx);
         }
-        Iterator<?> names = t.getPropertyIterator();
+        Iterator<?> names = t.getProperties().iterator();
         while ( names.hasNext() ) {
 			Property element = (Property) names.next();
 			String name = element.getName();
@@ -313,7 +313,7 @@ void addPropertiesToList(Component t, String prefix, int cursorPosition, IHQLCom
         if (t == null) {
             return;
         }
-        Iterator<?> props = t.getPropertyIterator();
+        Iterator<?> props = t.getProperties().iterator();
         while ( props.hasNext() ) {
 			Property element = (Property) props.next();			
 			String candidate = element.getName();
diff --git a/orm/src/main/java/org/hibernate/tool/internal/export/hbm/Cfg2HbmTool.java b/orm/src/main/java/org/hibernate/tool/internal/export/hbm/Cfg2HbmTool.java
index 392f620f03..9b3d504c06 100644
--- a/orm/src/main/java/org/hibernate/tool/internal/export/hbm/Cfg2HbmTool.java
+++ b/orm/src/main/java/org/hibernate/tool/internal/export/hbm/Cfg2HbmTool.java
@@ -467,7 +467,7 @@ public String getSafeHibernateTypeName(Property p) {
 	}
 
 	public Iterator<?> getProperties(Component v) {
-		return new SkipBackRefPropertyIterator(v.getPropertyIterator());
+		return new SkipBackRefPropertyIterator(v.getProperties().iterator());
 	}
 
 	public Iterator<?> getProperties(PersistentClass pc) {
diff --git a/orm/src/main/java/org/hibernate/tool/internal/export/java/BasicPOJOClass.java b/orm/src/main/java/org/hibernate/tool/internal/export/java/BasicPOJOClass.java
index 501652fb4d..69e4a83c19 100644
--- a/orm/src/main/java/org/hibernate/tool/internal/export/java/BasicPOJOClass.java
+++ b/orm/src/main/java/org/hibernate/tool/internal/export/java/BasicPOJOClass.java
@@ -348,7 +348,7 @@ public String generateAnnColumnAnnotation(Property property) {
 		if ( property.isComposite() ) {
 			annotations.append( "@" + importType("jakarta.persistence.AttributeOverrides") +"( {" );
 			Component component = (Component) property.getValue();
-			Iterator<?> subElements = component.getPropertyIterator();
+			Iterator<?> subElements = component.getProperties().iterator();
 			buildRecursiveAttributeOverride( subElements, null, property, annotations );
 			annotations.setLength( annotations.length() - 2 );
 			annotations.append( " } )" );
@@ -390,7 +390,7 @@ private void buildRecursiveAttributeOverride(Iterator<?> subElements, String pat
 				}
 				path = path + subProperty.getName();
 				Component component = (Component) subProperty.getValue();
-				buildRecursiveAttributeOverride( component.getPropertyIterator(), path, subProperty, annotations );
+				buildRecursiveAttributeOverride( component.getProperties().iterator(), path, subProperty, annotations );
 			}
 			else {
 				Selectable selectable = subProperty.getColumns().get(0);
@@ -821,7 +821,7 @@ protected boolean isRequiredInConstructor(Property field) {
 				return true;
 			} else if (field.getValue() instanceof Component) {
 				Component c = (Component) field.getValue();
-				Iterator<?> it = c.getPropertyIterator();
+				Iterator<?> it = c.getProperties().iterator();
 				while ( it.hasNext() ) {
 					Property prop = (Property) it.next();
 					if(isRequiredInConstructor(prop)) {
diff --git a/orm/src/main/java/org/hibernate/tool/internal/export/java/ComponentPOJOClass.java b/orm/src/main/java/org/hibernate/tool/internal/export/java/ComponentPOJOClass.java
index ec62fa7745..a162aa4de7 100644
--- a/orm/src/main/java/org/hibernate/tool/internal/export/java/ComponentPOJOClass.java
+++ b/orm/src/main/java/org/hibernate/tool/internal/export/java/ComponentPOJOClass.java
@@ -73,7 +73,7 @@ public String getImplements() {
 	}
 	
 	public Iterator<Property> getAllPropertiesIterator() {
-		return clazz.getPropertyIterator();
+		return clazz.getProperties().iterator();
 	}
 
 	public boolean isComponent() {