diff --git a/src/pisi-build b/src/pisi-build
index 0412dcaf..cc8cefa9 100755
--- a/src/pisi-build
+++ b/src/pisi-build
@@ -4,7 +4,7 @@
 # python standard library
 from os.path import basename
 
-import pisi.config
+import pisi.context
 import pisi.util
 import pisi.ui
 from pisi.build import PisiBuild, PisiBuildError
@@ -47,7 +47,7 @@ def main():
         pspec = args[0]
 
     # What we need to do first is create a context with our specfile
-    ctx = pisi.config.Context(pspec)
+    ctx = pisi.context.Context(pspec)
 
     # don't do the real job here. this is just a CLI!
     pb = PisiBuild(ctx)
diff --git a/src/pisi/actionsapi/libtoolize.py b/src/pisi/actionsapi/libtoolize.py
index 3eb9a78e..7fb5e501 100644
--- a/src/pisi/actionsapi/libtoolize.py
+++ b/src/pisi/actionsapi/libtoolize.py
@@ -4,11 +4,13 @@
 import os,sys
 
 #sys.path.append('..')
-import pisi.config
+from pisi.context import Context
 
 def libtoolize():
     ''' FIXME: Düzgün hale getirilecek '''
     ''' patch source with ltmain patches '''
 
-    os.system( 'patch -sN < ' + pisi.config.lib_dir() + '/portage-1.4.1.patch' )
-    os.system( 'patch -sN < ' + pisi.config.lib_dir() + '/sed-1.4.0.patch' )
+    # no need to create a context for calling static functions
+    # currently staticmethods doesn't work in Contex but this function isn't used to ;)
+    os.system( 'patch -sN < ' + Context.lib_dir() + '/portage-1.4.1.patch' )
+    os.system( 'patch -sN < ' + Context.lib_dir() + '/sed-1.4.0.patch' )
diff --git a/src/pisi/config.py b/src/pisi/context.py
similarity index 100%
rename from src/pisi/config.py
rename to src/pisi/context.py
diff --git a/src/unittests/archivetests.py b/src/unittests/archivetests.py
index 6c10cb41..7c563c8f 100644
--- a/src/unittests/archivetests.py
+++ b/src/unittests/archivetests.py
@@ -6,14 +6,14 @@ from os.path import basename, islink
 from pisi import archive
 from pisi import fetcher
 from pisi import util
-from pisi import config
+from pisi import context
 
 class ArchiveFileTestCase(unittest.TestCase):
 #     def setUp(self):
 # 	pass
 
     def testUnpackTar(self):
-	ctx = config.Context("samples/popt.pspec")
+	ctx = context.Context("samples/popt.pspec")
 
 	targetDir = ctx.build_work_dir()
 	achv = archive.Archive(ctx)
@@ -35,7 +35,7 @@ class ArchiveFileTestCase(unittest.TestCase):
 			 "171545adab7b51ebf6ec5575d3000a95")
 
     def testUnpackZip(self):
-	ctx = config.Context("samples/sandbox.pspec")
+	ctx = context.Context("samples/sandbox.pspec")
 	fetch = fetcher.Fetcher(ctx)
 	fetch.fetch()
 
diff --git a/src/unittests/fetchertests.py b/src/unittests/fetchertests.py
index cddd1d2b..d18ff87b 100644
--- a/src/unittests/fetchertests.py
+++ b/src/unittests/fetchertests.py
@@ -4,11 +4,11 @@ import os
 
 from pisi import fetcher
 from pisi import util
-from pisi import config
+from pisi import context
 
 class FetcherTestCase(unittest.TestCase):
     def setUp(self):
-	self.ctx = config.Context("samples/popt.pspec")
+	self.ctx = context.Context("samples/popt.pspec")
 
 	self.fetch = fetcher.Fetcher(self.ctx)