2 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/com/c2kernel/gui/collection/AggregationMemberRenderer.java b/src/main/java/com/c2kernel/gui/collection/AggregationMemberRenderer.java
index db1426e..d84a88d 100644
--- a/src/main/java/com/c2kernel/gui/collection/AggregationMemberRenderer.java
+++ b/src/main/java/com/c2kernel/gui/collection/AggregationMemberRenderer.java
@@ -43,7 +43,7 @@ public class AggregationMemberRenderer implements VertexRenderer
 
 		try
 		{
-			String name = memberPair.getEntityName();
+			String name = memberPair.getItemName();
 
 			g2d.drawString( name,
 				centre.x-metrics.stringWidth(name)/2,
diff --git a/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java b/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java
index 9e7d93c..89479df 100644
--- a/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java
+++ b/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java
@@ -15,13 +15,13 @@ import javax.swing.JToggleButton;
 
 import com.c2kernel.collection.AggregationMember;
 import com.c2kernel.collection.MembershipException;
-import com.c2kernel.entity.proxy.EntityProxy;
+import com.c2kernel.entity.proxy.ItemProxy;
 import com.c2kernel.graph.model.Vertex;
 import com.c2kernel.gui.DomainKeyConsumer;
 import com.c2kernel.gui.MainFrame;
 import com.c2kernel.gui.graph.view.SelectedVertexPanel;
 import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.EntityPath;
+import com.c2kernel.lookup.ItemPath;
 import com.c2kernel.process.Gateway;
 import com.c2kernel.utils.Language;
 
@@ -80,7 +80,7 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
                 }
                 else {
                     MainFrame.itemFinder.clearConsumer(me);
-                    if (selectedMember.getEntityKey() > -1) findButton.setEnabled(true);
+                    if (selectedMember.getSystemKey() > -1) findButton.setEnabled(true);
                 }
             }
         });
@@ -88,7 +88,7 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
         removeButton.addActionListener(new ActionListener() {
             @Override
 			public void actionPerformed(ActionEvent ae) {
-                selectedMember.clearEntity();
+                selectedMember.clearItem();
                 selectedMember.getProperties().remove("Name");
                 select(selectedMember);
             }
@@ -109,10 +109,10 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
 	public void select(Vertex vert) {
         selectedMember = (AggregationMember)vert;
 		slotNumber.setText(String.valueOf(vert.getID()));
-        int memberId = selectedMember.getEntityKey();
+        int memberId = selectedMember.getSystemKey();
         String name = "Empty";
         try {
-            EntityProxy member = Gateway.getProxyManager().getProxy(new EntityPath(memberId));
+            ItemProxy member = Gateway.getProxyManager().getProxy(new ItemPath(memberId));
             name = member.getName();
         } catch (Exception e) { }
         memberKey.setText(name);
@@ -142,7 +142,7 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
     @Override
 	public void push(DomainPath key) {
         try {
-            selectedMember.assignEntity(key.getSysKey());
+            selectedMember.assignItem(key.getSysKey());
             select(selectedMember);
         } catch (MembershipException ex) {
             JOptionPane.showMessageDialog(null, "Product does not fit in this slot", "Error", JOptionPane.ERROR_MESSAGE);