Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 5076)
+++ trunk/doc-rnd/hacking/renames	(revision 5077)
@@ -1160,3 +1160,6 @@
 ALLOW_READABLE -> PCB_UNIT_ALLOW_READABLE
 ALLOW_NATURAL -> PCB_UNIT_ALLOW_NATURAL
 ALLOW_ALL -> PCB_UNIT_ALLOW_ALL
+ActionExecuteFile -> pcb_act_ExecuteFile
+executefile_help -> pcb_acth_ExecuteFile
+executefile_syntax -> pcb_acts_ExecuteFile
Index: trunk/src/action_act.c
===================================================================
--- trunk/src/action_act.c	(revision 5076)
+++ trunk/src/action_act.c	(revision 5077)
@@ -37,9 +37,9 @@
  */
 /* --------------------------------------------------------------------------- */
 
-static const char executefile_syntax[] = "ExecuteFile(filename)";
+static const char pcb_acts_ExecuteFile[] = "ExecuteFile(filename)";
 
-static const char executefile_help[] = "Run actions from the given file.";
+static const char pcb_acth_ExecuteFile[] = "Run actions from the given file.";
 
 /* %start-doc actions ExecuteFile
 
@@ -47,7 +47,7 @@
 
 %end-doc */
 
-int ActionExecuteFile(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
+int pcb_act_ExecuteFile(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
 	FILE *fp;
 	const char *fname;
@@ -56,7 +56,7 @@
 	char *sp;
 
 	if (argc != 1)
-		PCB_AFAIL(executefile);
+		PCB_ACT_FAIL(ExecuteFile);
 
 	fname = argv[0];
 
@@ -104,8 +104,8 @@
 /* --------------------------------------------------------------------------- */
 
 pcb_hid_action_t action_action_list[] = {
-	{"ExecuteFile", 0, ActionExecuteFile,
-	 executefile_help, executefile_syntax}
+	{"ExecuteFile", 0, pcb_act_ExecuteFile,
+	 pcb_acth_ExecuteFile, pcb_acts_ExecuteFile}
 };
 
 PCB_REGISTER_ACTIONS(action_action_list, NULL)
Index: trunk/src/action_helper.h
===================================================================
--- trunk/src/action_helper.h	(revision 5076)
+++ trunk/src/action_helper.h	(revision 5077)
@@ -83,4 +83,6 @@
  */
 #define PCB_AFAIL(x) { pcb_message(PCB_MSG_ERROR, "Syntax error.  Usage:\n%s\n", (x##_syntax)); return 1; }
 
+#define PCB_ACT_FAIL(x) { pcb_message(PCB_MSG_ERROR, "Syntax error.  Usage:\n%s\n", (pcb_acts_ ## x)); return 1; }
+
 #endif
Index: trunk/src_plugins/import_sch/import_sch.c
===================================================================
--- trunk/src_plugins/import_sch/import_sch.c	(revision 5076)
+++ trunk/src_plugins/import_sch/import_sch.c	(revision 5077)
@@ -51,7 +51,7 @@
 
 conf_import_sch_t conf_import_sch;
 
-extern int ActionExecuteFile(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y);
+extern int pcb_act_ExecuteFile(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y);
 
 /* ---------------------------------------------------------------- */
 static const char import_syntax[] =
@@ -342,12 +342,12 @@
 		}
 
 #ifdef DEBUG
-		printf("ActionImport:  ===========  About to run ActionExecuteFile, file = %s  ============\n", tmpfile);
+		printf("ActionImport:  ===========  About to run pcb_act_ExecuteFile, file = %s  ============\n", tmpfile);
 #endif
 
 		cmd[0] = tmpfile;
 		cmd[1] = NULL;
-		ActionExecuteFile(1, cmd, 0, 0);
+		pcb_act_ExecuteFile(1, cmd, 0, 0);
 
 		free(cmd);
 		pcb_tempfile_unlink(tmpfile);
@@ -421,7 +421,7 @@
 
 		cmd[0] = tmpfile;
 		cmd[1] = NULL;
-		ActionExecuteFile(1, cmd, 0, 0);
+		pcb_act_ExecuteFile(1, cmd, 0, 0);
 
 		free((char*)cmd[2]);
 		free((char*)cmd[3]);