diff --git a/e2fsprogs/mke2fs.c b/e2fsprogs/mke2fs.c
index e6a1392c9..787f28ebf 100644
--- a/e2fsprogs/mke2fs.c
+++ b/e2fsprogs/mke2fs.c
@@ -1199,7 +1199,7 @@ BLOCKSIZE_ERROR:
 	return 1;
 }
 
-static void clean_up(void)
+static void mke2fs_clean_up(void)
 {
 	if (ENABLE_FEATURE_CLEAN_UP && journal_device) free(journal_device);
 }
@@ -1214,7 +1214,7 @@ int mke2fs_main (int argc, char *argv[])
 	io_manager	io_ptr;
 
 	if (ENABLE_FEATURE_CLEAN_UP)
-		atexit(clean_up);
+		atexit(mke2fs_clean_up);
 	if(!PRS(argc, argv))
 		return 0;
 
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index f228c56aa..2bd9a65ae 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -579,7 +579,7 @@ static ATTRIBUTE_NORETURN void do_findfs(int argc, char **argv)
 #define do_findfs(x, y)
 #endif
 
-static void clean_up(void)
+static void tune2fs_clean_up(void)
 {
 	if (ENABLE_FEATURE_CLEAN_UP && device_name) free(device_name);
 	if (ENABLE_FEATURE_CLEAN_UP && journal_device) free(journal_device);
@@ -593,7 +593,7 @@ int tune2fs_main(int argc, char **argv)
 	io_manager io_ptr;
 
 	if (ENABLE_FEATURE_CLEAN_UP)
-		atexit(clean_up);
+		atexit(tune2fs_clean_up);
 
 	if (ENABLE_FINDFS && (bb_applet_name[0] == 'f')) /* findfs */
 		do_findfs(argc, argv);  /* no return */