diff -r 5b9d4d8641ce -r ae255c9aa552 sysperfana/perfinvestigator/com.nokia.carbide.cpp.pi.util/src/com/nokia/carbide/cpp/internal/pi/util/config/PIConfigXMLLoader.java
--- a/sysperfana/perfinvestigator/com.nokia.carbide.cpp.pi.util/src/com/nokia/carbide/cpp/internal/pi/util/config/PIConfigXMLLoader.java	Wed Jun 23 14:49:59 2010 +0300
+++ b/sysperfana/perfinvestigator/com.nokia.carbide.cpp.pi.util/src/com/nokia/carbide/cpp/internal/pi/util/config/PIConfigXMLLoader.java	Wed Jun 23 15:05:09 2010 +0300
@@ -40,7 +40,7 @@
 
 		// blank file could cause IOException, which is unnecessary. Just return blank model
 		if (url.openStream().available() == 0) {
-			return PIConfigFactory.eINSTANCE.createButtonEventProfileListType();
+			return PIConfigFactory.E_INSTANCE.createButtonEventProfileListType();
 		}
 
 		URI xmlURI = URI.createURI(url.toString());
@@ -67,7 +67,7 @@
 		Resource r = resFactory.createResource(xmlURI);
 		EList<EObject> contents = r.getContents();
 	
-		PIConfigFactory factory = PIConfigPackage.eINSTANCE.getPIConfigFactory();
+		PIConfigFactory factory = PIConfigPackage.E_INSTANCE.getPIConfigFactory();
 		DocumentRoot root = factory.createDocumentRoot();
 		root.setButtonEventProfileList(list);
 		contents.add(root);