diff --git a/src/pisi/context.py b/src/pisi/context.py
index 50e7c645..36813019 100644
--- a/src/pisi/context.py
+++ b/src/pisi/context.py
@@ -39,9 +39,9 @@ class Constants:
 	self.c.files_dir = "files"
 
 	# functions in actions_file
-	self.c.setup_func = "setup"
-	self.c.build_func = "build"
-	self.c.install_func = "install"
+	self.c.setup_func = "src_setup"
+	self.c.build_func = "src_build"
+	self.c.install_func = "src_install"
 
     def __getattr__(self, attr):
  	return getattr(self.c, attr)
diff --git a/src/samples/popt/actions.py b/src/samples/popt/actions.py
index f9e579d3..0b149508 100644
--- a/src/samples/popt/actions.py
+++ b/src/samples/popt/actions.py
@@ -1,17 +1,20 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-import pisi.actionsapi.gnuconfig as gnuconfig
-import pisi.actionsapi.libtoolize as libtoolize
-import pisi.actionsapi.autotools as autotools
+#import pisi.actionsapi.gnuconfig as gnuconfig
+#import pisi.actionsapi.libtoolize as libtoolize
+#import pisi.actionsapi.autotools as autotools
 
-def setup():
-    gnuconfig.gnuconfig_update()
+from pisi.actionsapi.gnuconfig import *
+from pisi.actionsapi.autotools import *
+
+def src_setup():
+    gnuconfig_update()
 #    libtoolize.libtoolize()
-    autotools.configure( '--with-nls' )
+    configure( '--with-nls' )
 
-def build():
-    autotools.make()
+def src_build():
+    make()
 
-def install():
-    autotools.install()
+def src_install():
+    install()