diff --git a/tools/embed.c b/tools/embed.c
index 1e5f56f..2cf5527 100644
--- a/tools/embed.c
+++ b/tools/embed.c
@@ -27,17 +27,17 @@
 #define _(string) gettext(string)
 
 /* constants */
-#ifndef PROGNAME
-# define PROGNAME	"panel-embed"
+#ifndef PROGNAME_PANEL_EMBED
+# define PROGNAME_PANEL_EMBED	"panel-embed"
 #endif
 #ifndef PREFIX
-# define PREFIX		"/usr/local"
+# define PREFIX			"/usr/local"
 #endif
 #ifndef DATADIR
-# define DATADIR	PREFIX "/share"
+# define DATADIR		PREFIX "/share"
 #endif
 #ifndef LOCALEDIR
-# define LOCALEDIR	DATADIR "/locale"
+# define LOCALEDIR		DATADIR "/locale"
 #endif
 
 
@@ -140,7 +140,7 @@ static void _embed_on_child(GPid pid, gint status, gpointer data)
 /* error */
 static int _error(char const * message, int ret)
 {
-	fprintf(stderr, "%s%s\n", PROGNAME ": ", message);
+	fprintf(stderr, "%s%s\n", PROGNAME_PANEL_EMBED ": ", message);
 	return ret;
 }
 
@@ -148,7 +148,8 @@ static int _error(char const * message, int ret)
 /* usage */
 static int _usage(void)
 {
-	fprintf(stderr, _("Usage: %s command [arguments...]\n"), PROGNAME);
+	fprintf(stderr, _("Usage: %s command [arguments...]\n"),
+			PROGNAME_PANEL_EMBED);
 	return 1;
 }
 
diff --git a/tools/message.c b/tools/message.c
index f66bf28..7ba93d3 100644
--- a/tools/message.c
+++ b/tools/message.c
@@ -31,17 +31,17 @@
 #define _(string) gettext(string)
 
 /* constants */
-#ifndef PROGNAME
-# define PROGNAME	"panel-message"
+#ifndef PROGNAME_PANEL_MESSAGE
+# define PROGNAME_PANEL_MESSAGE	"panel-message"
 #endif
 #ifndef PREFIX
-# define PREFIX         "/usr/local"
+# define PREFIX 	        "/usr/local"
 #endif
 #ifndef DATADIR
-# define DATADIR	PREFIX "/share"
+# define DATADIR		PREFIX "/share"
 #endif
 #ifndef LOCALEDIR
-# define LOCALEDIR	DATADIR "/locale"
+# define LOCALEDIR		DATADIR "/locale"
 #endif
 
 
@@ -151,7 +151,7 @@ static gboolean _message_on_timeout(gpointer data)
 /* error */
 static int _error(char const * message, int ret)
 {
-	fputs(PROGNAME ": ", stderr);
+	fputs(PROGNAME_PANEL_MESSAGE ": ", stderr);
 	perror(message);
 	return ret;
 }
@@ -161,7 +161,8 @@ static int _error(char const * message, int ret)
 static int _usage(void)
 {
 	fprintf(stderr, _("Usage: %s [-EIQW][-T title][-t timeout] message\n"
-"       %s [-N name][-T title][-t timeout] message\n"), PROGNAME, PROGNAME);
+"       %s [-N name][-T title][-t timeout] message\n"), PROGNAME_PANEL_MESSAGE,
+			PROGNAME_PANEL_MESSAGE);
 	return 1;
 }
 
diff --git a/tools/notify.c b/tools/notify.c
index f26c17d..2db1ca0 100644
--- a/tools/notify.c
+++ b/tools/notify.c
@@ -33,22 +33,23 @@
 #define N_(string) string
 
 /* constants */
-#ifndef PROGNAME
-# define PROGNAME	"panel-notify"
+#ifndef PROGNAME_PANEL_NOTIFY
+# define PROGNAME_PANEL_NOTIFY	"panel-notify"
 #endif
+#define PROGNAME		PROGNAME_PANEL_NOTIFY
 #include "helper.c"
 
 #ifndef PREFIX
-# define PREFIX		"/usr/local"
+# define PREFIX			"/usr/local"
 #endif
 #ifndef LIBDIR
-# define LIBDIR		PREFIX "/lib"
+# define LIBDIR			PREFIX "/lib"
 #endif
 #ifndef DATADIR
-# define DATADIR	PREFIX "/share"
+# define DATADIR		PREFIX "/share"
 #endif
 #ifndef LOCALEDIR
-# define LOCALEDIR	DATADIR "/locale"
+# define LOCALEDIR		DATADIR "/locale"
 #endif
 
 
@@ -84,7 +85,7 @@ static int _notify_embed(GtkIconSize iconsize, int timeout, char * applets[])
 			PANEL_WINDOW_TYPE_NOTIFICATION, iconsize);
 	for(i = 0; applets[i] != NULL; i++)
 		if(_panel_append(&panel, PANEL_POSITION_TOP, applets[i]) != 0)
-			error_print(PROGNAME);
+			error_print(PROGNAME_PANEL_NOTIFY);
 	if((xid = _panel_get_xid(&panel)) == 0)
 		/* XXX report error */
 		return -1;
@@ -105,7 +106,7 @@ static int _notify_panel(GtkIconSize iconsize, int timeout, char * applets[])
 	_panel_set_title(&panel, _("Notification"));
 	for(i = 0; applets[i] != NULL; i++)
 		if(_panel_append(&panel, PANEL_POSITION_TOP, applets[i]) != 0)
-			error_print(PROGNAME);
+			error_print(PROGNAME_PANEL_NOTIFY);
 	_panel_show(&panel, TRUE);
 	if(timeout > 0)
 		panel.timeout = g_timeout_add(timeout * 1000,
@@ -140,7 +141,8 @@ static int _usage(void)
 "  -X	Use huge icons\n"
 "  -x	Use icons the size of menus\n"
 "  -t	Time to wait before disappearing (0: unlimited)\n"
-"  -l	Lists the plug-ins available\n"), PROGNAME, PROGNAME);
+"  -l	Lists the plug-ins available\n"), PROGNAME_PANEL_NOTIFY,
+			PROGNAME_PANEL_NOTIFY);
 	return 1;
 }
 
diff --git a/tools/test.c b/tools/test.c
index 9bafd69..145bdb2 100644
--- a/tools/test.c
+++ b/tools/test.c
@@ -31,9 +31,10 @@
 #define _(string) gettext(string)
 #define N_(string) string
 
-#ifndef PROGNAME
-# define PROGNAME	"panel-test"
+#ifndef PROGNAME_PANEL_TEST
+# define PROGNAME_PANEL_TEST	"panel-test"
 #endif
+#define PROGNAME		PROGNAME_PANEL_TEST
 #include "helper.c"
 
 /* constants */
@@ -71,7 +72,7 @@ static int _test(PanelWindowType type, PanelWindowPosition position,
 	_panel_set_title(&panel, "Applet tester");
 	for(i = 0; applets[i] != NULL; i++)
 		if(_panel_append(&panel, PANEL_POSITION_TOP, applets[i]) != 0)
-			error_print(PROGNAME);
+			error_print(PROGNAME_PANEL_TEST);
 	_panel_show(&panel, TRUE);
 	gtk_main();
 	_panel_destroy(&panel);
@@ -82,8 +83,8 @@ static int _test(PanelWindowType type, PanelWindowPosition position,
 /* usage */
 static int _usage(void)
 {
-	fputs("Usage: " PROGNAME " [-C|-F|-M][-L|-S|-X|-x][-n] applet...\n"
-"       " PROGNAME " -l\n"
+	fputs("Usage: " PROGNAME_PANEL_TEST " [-C|-F|-M][-L|-S|-X|-x][-n] applet...\n"
+"       " PROGNAME_PANEL_TEST " -l\n"
 "  -l	Lists the plug-ins available\n", stderr);
 	return 1;
 }