Index: trunk/src_plugins/ar_extern/ar_extern.c
===================================================================
--- trunk/src_plugins/ar_extern/ar_extern.c	(revision 33852)
+++ trunk/src_plugins/ar_extern/ar_extern.c	(revision 33853)
@@ -45,7 +45,6 @@
 #include "src_plugins/lib_netmap/netmap.h"
 #include "ar_extern_conf.h"
 
-#define AR_EXTERN_CONF_FN "ar_extern.conf"
 conf_ar_extern_t conf_ar_extern;
 
 static const char *extern_cookie = "extern autorouter plugin";
@@ -240,7 +239,7 @@
 void pplg_uninit_ar_extern(void)
 {
 	extroute_free_conf();
-	rnd_conf_unreg_file(AR_EXTERN_CONF_FN, ar_extern_conf_internal);
+	rnd_conf_unreg_intern(ar_extern_conf_internal);
 	rnd_conf_unreg_fields("plugins/ar_extern/");
 	rnd_remove_actions_by_cookie(extern_cookie);
 	rnd_hid_menu_unload(rnd_gui, extern_cookie);
@@ -253,7 +252,7 @@
 
 	RND_REGISTER_ACTIONS(extern_action_list, extern_cookie)
 
-	rnd_conf_reg_file(AR_EXTERN_CONF_FN, ar_extern_conf_internal);
+	rnd_conf_reg_intern(ar_extern_conf_internal);
 
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_ar_extern, field,isarray,type_name,cpath,cname,desc,flags);
Index: trunk/src_plugins/asm/asm.c
===================================================================
--- trunk/src_plugins/asm/asm.c	(revision 33852)
+++ trunk/src_plugins/asm/asm.c	(revision 33853)
@@ -50,9 +50,7 @@
 #include "menu_internal.c"
 
 conf_asm_t conf_asm;
-#define ASM_CONF_FN "asm.conf"
 
-
 static const char *asm_cookie = "asm plugin";
 
 /*** internal list of all parts, grouped; have to be arrays for qsort(), so can't
@@ -637,7 +635,7 @@
 {
 	rnd_hid_menu_unload(rnd_gui, asm_cookie);
 	rnd_remove_actions_by_cookie(asm_cookie);
-	rnd_conf_unreg_file(ASM_CONF_FN, asm_conf_internal);
+	rnd_conf_unreg_intern(asm_conf_internal);
 	rnd_conf_unreg_fields("plugins/asm1/");
 }
 
@@ -644,7 +642,7 @@
 int pplg_init_asm(void)
 {
 	RND_API_CHK_VER;
-	rnd_conf_reg_file(ASM_CONF_FN, asm_conf_internal);
+	rnd_conf_reg_intern(asm_conf_internal);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_asm, field,isarray,type_name,cpath,cname,desc,flags);
 #include "asm_conf_fields.h"
Index: trunk/src_plugins/cam/cam.c
===================================================================
--- trunk/src_plugins/cam/cam.c	(revision 33852)
+++ trunk/src_plugins/cam/cam.c	(revision 33853)
@@ -47,7 +47,6 @@
 static const char *cam_cookie = "cam exporter";
 
 conf_cam_t conf_cam;
-#define CAM_CONF_FN "cam.conf"
 
 #include "cam_compile.c"
 
@@ -284,7 +283,7 @@
 
 void pplg_uninit_cam(void)
 {
-	rnd_conf_unreg_file(CAM_CONF_FN, cam_conf_internal);
+	rnd_conf_unreg_intern(cam_conf_internal);
 	rnd_conf_unreg_fields("plugins/cam/");
 	rnd_remove_actions_by_cookie(cam_cookie);
 	rnd_export_remove_opts_by_cookie(cam_cookie);
@@ -294,7 +293,7 @@
 int pplg_init_cam(void)
 {
 	RND_API_CHK_VER;
-	rnd_conf_reg_file(CAM_CONF_FN, cam_conf_internal);
+	rnd_conf_reg_intern(cam_conf_internal);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_cam, field,isarray,type_name,cpath,cname,desc,flags);
 #include "cam_conf_fields.h"
Index: trunk/src_plugins/ch_editpoint/ch_editpoint.c
===================================================================
--- trunk/src_plugins/ch_editpoint/ch_editpoint.c	(revision 33852)
+++ trunk/src_plugins/ch_editpoint/ch_editpoint.c	(revision 33853)
@@ -55,9 +55,7 @@
 #include "../src_plugins/ch_editpoint/menu_internal.c"
 
 conf_ch_editpoint_t conf_ch_editpoint;
-#define CH_EDITPOINT_CONF_FN "ch_editpoint.conf"
 
-
 static const char pcb_ch_editpoint_cookie[] = "ch_editpoint plugin";
 
 static vtp0_t editpoint_raw[2];
@@ -169,7 +167,7 @@
 	vtp0_uninit(editpoint_objs);
 	vtp0_uninit(old_editpoint_objs);
 
-	rnd_conf_unreg_file(CH_EDITPOINT_CONF_FN, ch_editpoint_conf_internal);
+	rnd_conf_unreg_intern(ch_editpoint_conf_internal);
 	rnd_hid_menu_unload(rnd_gui, pcb_ch_editpoint_cookie);
 	rnd_conf_unreg_fields("plugins/ch_editpoint/");
 }
@@ -178,7 +176,7 @@
 {
 	RND_API_CHK_VER;
 
-	rnd_conf_reg_file(CH_EDITPOINT_CONF_FN, ch_editpoint_conf_internal);
+	rnd_conf_reg_intern(ch_editpoint_conf_internal);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_ch_editpoint, field,isarray,type_name,cpath,cname,desc,flags);
 #include "ch_editpoint_conf_fields.h"
Index: trunk/src_plugins/dialogs/dialogs.c
===================================================================
--- trunk/src_plugins/dialogs/dialogs.c	(revision 33852)
+++ trunk/src_plugins/dialogs/dialogs.c	(revision 33853)
@@ -67,7 +67,6 @@
 #include "conf_internal.c"
 
 conf_adialogs_t adialogs_conf;
-#define ADIALOGS_CONF_FN "adialogs.conf"
 
 extern const char pcb_acts_dlg_confval_edit[];
 extern const char pcb_acth_dlg_confval_edit[];
@@ -119,7 +118,7 @@
 	pcb_view_dlg_uninit();
 	pcb_dlg_fontsel_uninit();
 
-	rnd_conf_unreg_file(ADIALOGS_CONF_FN, adialogs_conf_internal);
+	rnd_conf_unreg_intern(adialogs_conf_internal);
 	rnd_conf_unreg_fields("plugins/dialogs/");
 }
 
@@ -131,7 +130,7 @@
 	rnd_conf_reg_field(adialogs_conf, field,isarray,type_name,cpath,cname,desc,flags);
 #include "adialogs_conf_fields.h"
 
-	rnd_conf_reg_file(ADIALOGS_CONF_FN, adialogs_conf_internal);
+	rnd_conf_reg_intern(adialogs_conf_internal);
 
 	RND_REGISTER_ACTIONS(dialogs_action_list, dialogs_cookie)
 	pcb_dlg_pref_init();
Index: trunk/src_plugins/drc_query/drc_query.c
===================================================================
--- trunk/src_plugins/drc_query/drc_query.c	(revision 33852)
+++ trunk/src_plugins/drc_query/drc_query.c	(revision 33853)
@@ -65,7 +65,6 @@
 static const char *drc_query_cookie = "drc_query";
 
 extern conf_drc_query_t conf_drc_query;
-#define DRC_QUERY_CONF_FN "drc_query.conf"
 
 #define DRC_CONF_PATH_PLUGIN "plugins/drc_query/"
 #define DRC_CONF_PATH_DISABLE "design/drc_disable/"
@@ -872,7 +871,7 @@
 
 	pcb_drc_impl_unreg(&drc_query_impl);
 	rnd_event_unbind_allcookie(drc_query_cookie);
-	rnd_conf_unreg_file(DRC_QUERY_CONF_FN, drc_query_conf_internal);
+	rnd_conf_unreg_intern(drc_query_conf_internal);
 	rnd_conf_unreg_fields(DRC_CONF_PATH_PLUGIN);
 	rnd_conf_hid_unreg(drc_query_cookie);
 
@@ -901,7 +900,7 @@
 	cbs.new_hlist_item_post = drc_query_newconf;
 	cfgid = rnd_conf_hid_reg(drc_query_cookie, &cbs);
 
-	rnd_conf_reg_file(DRC_QUERY_CONF_FN, drc_query_conf_internal);
+	rnd_conf_reg_intern(drc_query_conf_internal);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_drc_query, field,isarray,type_name,cpath,cname,desc,flags);
 #include "drc_query_conf_fields.h"
Index: trunk/src_plugins/fp_fs/fp_fs.c
===================================================================
--- trunk/src_plugins/fp_fs/fp_fs.c	(revision 33852)
+++ trunk/src_plugins/fp_fs/fp_fs.c	(revision 33853)
@@ -57,7 +57,6 @@
 
 #include "fp_fs_conf.h"
 
-#define FP_FS_CONF_FN "ar_extern.conf"
 static conf_fp_fs_t conf_fp_fs;
 static const char fp_fs_cookie[] = "fp_fs plugin";
 
@@ -569,7 +568,7 @@
 
 	rnd_conf_hid_unreg(fp_fs_cookie);
 
-	rnd_conf_unreg_file(FP_FS_CONF_FN, fp_fs_conf_internal);
+	rnd_conf_unreg_intern(fp_fs_conf_internal);
 
 	fp_fs_cache_uninit(&fp_fs_cache);
 	rnd_conf_unreg_fields("plugins/fp_fs/");
@@ -588,7 +587,7 @@
 	RND_HOOK_REGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_fs);
 	htsp_init(&fp_fs_cache, strhash, strkeyeq);
 
-	rnd_conf_reg_file(FP_FS_CONF_FN, fp_fs_conf_internal);
+	rnd_conf_reg_intern(fp_fs_conf_internal);
 
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_fp_fs, field,isarray,type_name,cpath,cname,desc,flags);
Index: trunk/src_plugins/fp_wget/fp_wget.c
===================================================================
--- trunk/src_plugins/fp_wget/fp_wget.c	(revision 33852)
+++ trunk/src_plugins/fp_wget/fp_wget.c	(revision 33853)
@@ -8,13 +8,11 @@
 
 conf_fp_wget_t conf_fp_wget;
 
-#define FP_WGET_CONF_FN "fp_wget.conf"
-
 int pplg_check_ver_fp_wget(int ver_needed) { return 0; }
 
 void pplg_uninit_fp_wget(void)
 {
-	rnd_conf_unreg_file(FP_WGET_CONF_FN, fp_wget_conf_internal);
+	rnd_conf_unreg_intern(fp_wget_conf_internal);
 	fp_gedasymbols_uninit();
 	fp_edakrill_uninit();
 	rnd_conf_unreg_fields("plugins/fp_wget/");
@@ -28,7 +26,7 @@
 	rnd_conf_reg_field(conf_fp_wget, field,isarray,type_name,cpath,cname,desc,flags);
 #include "fp_wget_conf_fields.h"
 
-	rnd_conf_reg_file(FP_WGET_CONF_FN, fp_wget_conf_internal);
+	rnd_conf_reg_intern(fp_wget_conf_internal);
 
 	fp_gedasymbols_init();
 	fp_edakrill_init();
Index: trunk/src_plugins/import_gnetlist/import_gnetlist.c
===================================================================
--- trunk/src_plugins/import_gnetlist/import_gnetlist.c	(revision 33852)
+++ trunk/src_plugins/import_gnetlist/import_gnetlist.c	(revision 33853)
@@ -45,8 +45,6 @@
 #include "import_gnetlist_conf.h"
 #include "../src_plugins/import_gnetlist/conf_internal.c"
 
-#define IMPORT_GNETLIST_CONF_FN "import_gnetlist.conf"
-
 conf_import_gnetlist_t conf_import_gnetlist;
 
 static pcb_plug_import_t import_gnetlist, import_lepton;
@@ -157,7 +155,7 @@
 {
 	RND_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_gnetlist);
 	RND_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_lepton);
-	rnd_conf_unreg_file(IMPORT_GNETLIST_CONF_FN, import_gnetlist_conf_internal);
+	rnd_conf_unreg_intern(import_gnetlist_conf_internal);
 	rnd_conf_unreg_fields("plugins/import_gnetlist/");
 }
 
@@ -189,7 +187,7 @@
 
 	RND_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_lepton);
 
-	rnd_conf_reg_file(IMPORT_GNETLIST_CONF_FN, import_gnetlist_conf_internal);
+	rnd_conf_reg_intern(import_gnetlist_conf_internal);
 
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_import_gnetlist, field,isarray,type_name,cpath,cname,desc,flags);
Index: trunk/src_plugins/order/order.c
===================================================================
--- trunk/src_plugins/order/order.c	(revision 33852)
+++ trunk/src_plugins/order/order.c	(revision 33853)
@@ -48,7 +48,6 @@
 static const char *order_cookie = "order plugin";
 
 conf_order_t conf_order;
-#define ORDER_CONF_FN "order.conf"
 
 vtp0_t pcb_order_imps;
 
@@ -179,7 +178,7 @@
 void pplg_uninit_order(void)
 {
 	rnd_remove_actions_by_cookie(order_cookie);
-	rnd_conf_unreg_file(ORDER_CONF_FN, order_conf_internal);
+	rnd_conf_unreg_intern(order_conf_internal);
 	rnd_conf_unreg_fields("plugins/order/");
 	rnd_hid_menu_unload(rnd_gui, order_cookie);
 }
@@ -188,7 +187,7 @@
 {
 	RND_API_CHK_VER;
 
-	rnd_conf_reg_file(ORDER_CONF_FN, order_conf_internal);
+	rnd_conf_reg_intern(order_conf_internal);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_order, field,isarray,type_name,cpath,cname,desc,flags);
 #include "order_conf_fields.h"
Index: trunk/src_plugins/order_pcbway/pcbway.c
===================================================================
--- trunk/src_plugins/order_pcbway/pcbway.c	(revision 33852)
+++ trunk/src_plugins/order_pcbway/pcbway.c	(revision 33853)
@@ -44,7 +44,6 @@
 #include "../src_plugins/order_pcbway/conf_internal.c"
 
 conf_order_pcbway_t conf_order_pcbway;
-#define ORDER_PCBWAY_CONF_FN "order_pcbway.conf"
 
 #define CFG conf_order_pcbway.plugins.order_pcbway
 #define SERVER "http://api-partner.pcbway.com"
@@ -570,7 +569,7 @@
 
 void pplg_uninit_order_pcbway(void)
 {
-	rnd_conf_unreg_file(ORDER_PCBWAY_CONF_FN, order_pcbway_conf_internal);
+	rnd_conf_unreg_intern(order_pcbway_conf_internal);
 	rnd_conf_unreg_fields("plugins/order_pcbway/");
 }
 
@@ -578,7 +577,7 @@
 {
 	RND_API_CHK_VER;
 
-	rnd_conf_reg_file(ORDER_PCBWAY_CONF_FN, order_pcbway_conf_internal);
+	rnd_conf_reg_intern(order_pcbway_conf_internal);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_order_pcbway, field,isarray,type_name,cpath,cname,desc,flags);
 #include "order_pcbway_conf_fields.h"
Index: trunk/src_plugins/show_netnames/show_netnames.c
===================================================================
--- trunk/src_plugins/show_netnames/show_netnames.c	(revision 33852)
+++ trunk/src_plugins/show_netnames/show_netnames.c	(revision 33853)
@@ -44,7 +44,6 @@
 #include "conf_internal.c"
 
 const char *pcb_show_netnames_cookie = "show_netnames plugin";
-#define SHOW_NETNAMES_CONF_FN "show_netnames.conf"
 conf_show_netnames_t conf_show_netnames;
 
 static pcb_qry_exec_t shn_qctx;
@@ -153,7 +152,7 @@
 {
 	show_netnames_invalidate();
 
-	rnd_conf_unreg_file(SHOW_NETNAMES_CONF_FN, show_netnames_conf_internal);
+	rnd_conf_unreg_intern(show_netnames_conf_internal);
 	rnd_hid_menu_unload(rnd_gui, pcb_show_netnames_cookie);
 	rnd_event_unbind_allcookie(pcb_show_netnames_cookie);
 	rnd_remove_actions_by_cookie(pcb_show_netnames_cookie);
@@ -164,7 +163,7 @@
 {
 	RND_API_CHK_VER;
 
-	rnd_conf_reg_file(SHOW_NETNAMES_CONF_FN, show_netnames_conf_internal);
+	rnd_conf_reg_intern(show_netnames_conf_internal);
 
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_show_netnames, field,isarray,type_name,cpath,cname,desc,flags);