diff --git a/Makefile.am b/Makefile.am
index 98d8a4f9e7c565b87846e431f824fbd25ae0c705..2a513f15f4e70124812968b6d343eb6824a3e933 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -273,11 +273,11 @@ pytools_PYTHON = \
 utils_PYTHON = \
 	lib/utils/__init__.py \
 	lib/utils/algo.py \
+	lib/utils/cfunc.py \
 	lib/utils/filelock.py \
 	lib/utils/hash.py \
 	lib/utils/io.py \
 	lib/utils/log.py \
-	lib/utils/mlock.py \
 	lib/utils/nodesetup.py \
 	lib/utils/process.py \
 	lib/utils/retry.py \
@@ -724,11 +724,11 @@ python_tests = \
 	test/ganeti.tools.ensure_dirs_unittest.py \
 	test/ganeti.uidpool_unittest.py \
 	test/ganeti.utils.algo_unittest.py \
+	test/ganeti.utils.cfunc_unittest.py \
 	test/ganeti.utils.filelock_unittest.py \
 	test/ganeti.utils.hash_unittest.py \
 	test/ganeti.utils.io_unittest.py \
 	test/ganeti.utils.log_unittest.py \
-	test/ganeti.utils.mlock_unittest.py \
 	test/ganeti.utils.nodesetup_unittest.py \
 	test/ganeti.utils.process_unittest.py \
 	test/ganeti.utils.retry_unittest.py \
diff --git a/lib/utils/__init__.py b/lib/utils/__init__.py
index 9f7cb24e125497ad9fd9a6e06f494c89c39a9d66..5d332ab3ffc6ea7f7a6ef19119e69c704a508eb0 100644
--- a/lib/utils/__init__.py
+++ b/lib/utils/__init__.py
@@ -43,11 +43,11 @@ from ganeti import constants
 from ganeti import compat
 
 from ganeti.utils.algo import *
+from ganeti.utils.cfunc import *
 from ganeti.utils.filelock import *
 from ganeti.utils.hash import *
 from ganeti.utils.io import *
 from ganeti.utils.log import *
-from ganeti.utils.mlock import *
 from ganeti.utils.nodesetup import *
 from ganeti.utils.process import *
 from ganeti.utils.retry import *
diff --git a/lib/utils/mlock.py b/lib/utils/cfunc.py
similarity index 100%
rename from lib/utils/mlock.py
rename to lib/utils/cfunc.py
diff --git a/test/ganeti.utils.mlock_unittest.py b/test/ganeti.utils.cfunc_unittest.py
similarity index 100%
rename from test/ganeti.utils.mlock_unittest.py
rename to test/ganeti.utils.cfunc_unittest.py