diff --git a/src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java b/src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java
index a7d387dc651d5e7f866b2951bc38c038e5745395..18dabb7423a5ec566e341c8502a035361fe0a8ad 100644
--- a/src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java
+++ b/src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java
@@ -449,7 +449,7 @@ public class DefaultTopologyComponent implements TopologyComponent {
 				if (!onlyOnline || mac.isOnline()) {
 					INode node = currentView.createNode(INodeID.get(mac
 							.getNetId()));
-					node.setProperty(SiSTypes.LOCATION,
+					node.setProperty(SiSTypes.PHY_LOCATION,
 							topoView.getPosition(mac.getMacAddress()));
 					currentView.addElement(node);
 				}
@@ -494,7 +494,7 @@ public class DefaultTopologyComponent implements TopologyComponent {
 									.getNetId()), INodeID.get(topoView.getMac(
 									neighborMac).getNetId()));
 							currentView.addElement(edge);
-							edge.setProperty(SiSTypes.DISTANCE, topoView
+							edge.setProperty(SiSTypes.PHY_DISTANCE, topoView
 									.getDistance(mac.getMacAddress(),
 											neighborMac));
 						}