diff --git a/pisi/constants.py b/pisi/constants.py
index 4db541a4..55e128a1 100644
--- a/pisi/constants.py
+++ b/pisi/constants.py
@@ -52,17 +52,10 @@ class Constants:
         self.__c.work_dir_suffix = "/work"
         self.__c.install_dir_suffix  = "/install"
 
-        # directory suffixes for intall. We'll use these directories
-        # for storing files related to the packages. Each package will
-        # have its own directory under lib_dir with has these
-        # sub-directories.
-        self.__c.comar_dir_suffix = "/comar"
-        self.__c.files_dir_suffix = "/files"
-        self.__c.metadata_dir_suffix = "/metadata"
-
         # file/directory names
         self.__c.actions_file = "actions.py"
         self.__c.files_dir = "files"
+        self.__c.metadata_dir = "metadata"
         self.__c.comar_dir = "comar"
         self.__c.files_xml = "files.xml"
         self.__c.metadata_xml = "metadata.xml"
diff --git a/pisi/package.py b/pisi/package.py
index 2a4485f4..fac9a7f8 100644
--- a/pisi/package.py
+++ b/pisi/package.py
@@ -115,4 +115,4 @@ class Package:
         return join( ctx.config.lib_dir(), packageDir)
 
     def comar_dir(self):
-        return join(self.pkg_dir(), ctx.const.comar_dir_suffix)
+        return join(self.pkg_dir(), ctx.const.comar_dir)