--- a/PackageId.st	Tue Jun 23 06:44:56 2015 +0200
+++ b/PackageId.st	Wed Jun 24 06:49:39 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -11,6 +13,8 @@
 "
 "{ Package: 'stx:libbasic' }"
 
+"{ NameSpace: Smalltalk }"
+
 Object subclass:#PackageId
 	instanceVariableNames:'packageIdString'
 	classVariableNames:''
@@ -260,7 +264,7 @@
      with 'lib'. This has the added advantage, that under unix, linking can be done with
      '-l'shortName."
 
-    ^ 'lib' , (packageIdString copy asString replaceAny:':/' with:$_)
+    ^ 'lib' , (ProjectDefinition projectDefinitionClassNameForDefinitionOf:packageIdString)
 
     "
      (PackageId from:'stx:libbasic') libraryName
@@ -337,6 +341,20 @@
      'exept/expecco/plugin/manualTest' asPackageId projectDefinitionClass
      'exept:expecco/plugin/manualTest' asPackageId projectDefinitionClass
      'exept_expecco_plugin_manualTest' asPackageId projectDefinitionClass
+     'exept/expecco/plugin/edi-edifact' asPackageId projectDefinitionClass
+    "
+!
+
+projectDefinitionClassName
+    ^ ProjectDefinition projectDefinitionClassNameForDefinitionOf:self
+
+    "
+     'stx:libbasic' asPackageId projectDefinitionClassName
+     'exept/expecco/foo' asPackageId projectDefinitionClassName
+     'exept/expecco/plugin/manualTest' asPackageId projectDefinitionClassName
+     'exept:expecco/plugin/manualTest' asPackageId projectDefinitionClassName
+     'exept_expecco_plugin_manualTest' asPackageId projectDefinitionClassName
+     'exept/expecco/plugin/edi-edifact' asPackageId projectDefinitionClassName
     "
 !
 
@@ -361,10 +379,10 @@
 !PackageId class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/PackageId.st,v 1.25 2014-12-19 23:29:21 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/PackageId.st,v 1.25 2014-12-19 23:29:21 vrany Exp $'
+    ^ '$Header$'
 ! !