Index: trunk/doc/developer/renames
===================================================================
--- trunk/doc/developer/renames	(revision 9330)
+++ trunk/doc/developer/renames	(revision 9331)
@@ -1653,3 +1653,23 @@
 MoveRatToLayer -> pcb_ratop_move_to_layer
 DestroyRat -> pcb_ratop_destroy
 RemoveRat -> pcb_ratop_remove
+CopySubc -> pcb_subcop_copy
+MoveSubc -> pcb_subcop_move
+Rotate90Subc -> pcb_subcop_rotate90
+MoveSubcToBuffer -> pcb_subcop_move_to_buffer
+AddSubcToBuffer -> pcb_subcop_add_to_buffer
+ChangeSubcSize -> pcb_subcop_change_size
+ChangeSubcClearSize -> pcb_subcop_change_clear_size
+ChangeSubc1stSize -> pcb_subcop_change_1st_size
+ChangeSubc2ndSize -> pcb_subcop_change_2nd_size
+ChangeSubcNonetlist -> pcb_subcop_change_nonetlist
+ChangeSubcName -> pcb_subcop_change_name
+DestroySubc -> pcb_subcop_destroy
+RemoveSubc_op -> pcb_subcop_remove
+ClrSubcOctagon -> pcb_subcop_clear_octagon
+SetSubcOctagon -> pcb_subcop_set_octagon
+ChangeSubcOctagon -> pcb_subcop_change_octagon
+ClrSubcSquare -> pcb_subcop_clear_square
+SetSubcSquare -> pcb_subcop_set_square
+ChangeSubcSquare -> pcb_subcop_change_square
+ChgFlagSubc -> pcb_subcop_change_flag
Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 9330)
+++ trunk/src/buffer.c	(revision 9331)
@@ -66,7 +66,7 @@
 	pcb_arcop_add_to_buffer,
 	pcb_ratop_add_to_buffer,
 	NULL,
-	AddSubcToBuffer
+	pcb_subcop_add_to_buffer
 };
 
 static pcb_opfunc_t MoveBufferFunctions = {
@@ -83,7 +83,7 @@
 	pcb_arcop_move_to_buffer,
 	pcb_ratop_move_to_buffer,
 	NULL,
-	MoveSubcToBuffer
+	pcb_subcop_move_to_buffer
 };
 
 /* ---------------------------------------------------------------------------
@@ -666,7 +666,7 @@
 	/* paste subcircuits */
 	PCB_SUBC_LOOP(PCB_PASTEBUFFER->Data);
 	{
-		CopySubc(&ctx, subc);
+		pcb_subcop_copy(&ctx, subc);
 		changed = pcb_true;
 	}
 	PCB_END_LOOP;
Index: trunk/src/change.c
===================================================================
--- trunk/src/change.c	(revision 9330)
+++ trunk/src/change.c	(revision 9331)
@@ -58,7 +58,7 @@
 	pcb_arcop_change_size,
 	NULL,
 	NULL,
-	ChangeSubcSize
+	pcb_subcop_change_size
 };
 
 static pcb_opfunc_t Change1stSizeFunctions = {
@@ -75,7 +75,7 @@
 	pcb_arcop_change_size,
 	NULL,
 	NULL,
-	ChangeSubc1stSize
+	pcb_subcop_change_1st_size
 };
 
 static pcb_opfunc_t Change2ndSizeFunctions = {
@@ -92,7 +92,7 @@
 	NULL,
 	NULL,
 	NULL,
-	ChangeSubc2ndSize
+	pcb_subcop_change_2nd_size
 };
 
 static pcb_opfunc_t ChangeThermalFunctions = {
@@ -126,7 +126,7 @@
 	pcb_arcop_change_clear_size,
 	NULL,
 	NULL,
-	ChangeSubcClearSize
+	pcb_subcop_change_clear_size
 };
 
 static pcb_opfunc_t ChangeNameFunctions = {
@@ -143,7 +143,7 @@
 	NULL,
 	NULL,
 	NULL,
-	ChangeSubcName
+	pcb_subcop_change_name
 };
 
 static pcb_opfunc_t ChangePinnumFunctions = {
@@ -177,7 +177,7 @@
 	NULL,
 	NULL,
 	NULL,
-	ChangeSubcSquare
+	pcb_subcop_change_square
 };
 
 static pcb_opfunc_t ChangeNonetlistFunctions = {
@@ -194,7 +194,7 @@
 	NULL,
 	NULL,
 	NULL,
-	ChangeSubcNonetlist,
+	pcb_subcop_change_nonetlist,
 };
 
 static pcb_opfunc_t ChangeJoinFunctions = {
@@ -228,7 +228,7 @@
 	NULL,
 	NULL,
 	NULL,
-	ChangeSubcOctagon,
+	pcb_subcop_change_octagon,
 };
 
 static pcb_opfunc_t ChangeMaskSizeFunctions = {
@@ -266,7 +266,7 @@
 	NULL,
 	NULL,
 	NULL,
-	SetSubcSquare
+	pcb_subcop_set_square
 };
 
 static pcb_opfunc_t SetJoinFunctions = {
@@ -300,7 +300,7 @@
 	NULL,
 	NULL,
 	NULL,
-	SetSubcOctagon
+	pcb_subcop_set_octagon
 };
 
 static pcb_opfunc_t ClrSquareFunctions = {
@@ -317,7 +317,7 @@
 	NULL,
 	NULL,
 	NULL,
-	ClrSubcSquare,
+	pcb_subcop_clear_square,
 };
 
 static pcb_opfunc_t ClrJoinFunctions = {
@@ -351,7 +351,7 @@
 	NULL,
 	NULL,
 	NULL,
-	ClrSubcOctagon
+	pcb_subcop_clear_octagon
 };
 
 static pcb_opfunc_t ChangeRadiusFunctions = {
Index: trunk/src/copy.c
===================================================================
--- trunk/src/copy.c	(revision 9330)
+++ trunk/src/copy.c	(revision 9331)
@@ -56,7 +56,7 @@
 	pcb_arcop_copy,
 	NULL,
 	NULL,
-	CopySubc
+	pcb_subcop_copy
 };
 
 /* ---------------------------------------------------------------------------
Index: trunk/src/flag.c
===================================================================
--- trunk/src/flag.c	(revision 9330)
+++ trunk/src/flag.c	(revision 9331)
@@ -45,7 +45,7 @@
 	pcb_arcop_change_flag,
 	NULL,
 	NULL,
-	ChgFlagSubc
+	pcb_subcop_change_flag
 };
 
 
Index: trunk/src/move.c
===================================================================
--- trunk/src/move.c	(revision 9330)
+++ trunk/src/move.c	(revision 9331)
@@ -62,7 +62,7 @@
 	pcb_arcop_move,
 	NULL,
 	NULL,
-	MoveSubc
+	pcb_subcop_move
 };
 
 static pcb_opfunc_t MoveToLayerFunctions = {
Index: trunk/src/obj_subc.c
===================================================================
--- trunk/src/obj_subc.c	(revision 9330)
+++ trunk/src/obj_subc.c	(revision 9331)
@@ -298,7 +298,7 @@
 
 
 /* copies a subcircuit onto the PCB.  Then does a draw. */
-void *CopySubc(pcb_opctx_t *ctx, pcb_subc_t *src)
+void *pcb_subcop_copy(pcb_opctx_t *ctx, pcb_subc_t *src)
 {
 	pcb_subc_t *sc;
 
@@ -312,23 +312,23 @@
 
 extern pcb_opfunc_t MoveFunctions, Rotate90Functions, ChgFlagFunctions;
 
-void *MoveSubc(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_move(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 	return pcb_subc_op(PCB->Data, sc, &MoveFunctions, ctx);
 }
 
-void *Rotate90Subc(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_rotate90(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 	return pcb_subc_op(PCB->Data, sc, &Rotate90Functions, ctx);
 }
 
-void *MoveSubcToBuffer(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_move_to_buffer(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
 }
 
-void *AddSubcToBuffer(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_add_to_buffer(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
@@ -335,85 +335,85 @@
 }
 
 
-void *ChangeSubcSize(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_change_size(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
 }
 
-void *ChangeSubcClearSize(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_change_clear_size(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
 }
 
-void *ChangeSubc1stSize(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_change_1st_size(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
 }
 
-void *ChangeSubc2ndSize(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_change_2nd_size(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
 }
 
-void *ChangeSubcNonetlist(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_change_nonetlist(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
 }
 
-void *ChangeSubcName(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_change_name(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
 }
 
-void *DestroySubc(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_destroy(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
 }
 
-void *RemoveSubc_op(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_remove(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
 }
 
-void *ClrSubcOctagon(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_clear_octagon(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
 }
 
-void *SetSubcOctagon(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_set_octagon(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
 }
 
-void *ChangeSubcOctagon(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_change_octagon(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
 }
 
-void *ClrSubcSquare(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_clear_square(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
 }
 
-void *SetSubcSquare(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_set_square(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
 }
 
-void *ChangeSubcSquare(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_change_square(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 #warning subc TODO
 	abort();
@@ -421,7 +421,7 @@
 
 
 #define PCB_SUBC_FLAGS (PCB_FLAG_FOUND | PCB_FLAG_CLEARLINE | PCB_FLAG_SELECTED | PCB_FLAG_AUTO | PCB_FLAG_LOCK | PCB_FLAG_VISIT)
-void *ChgFlagSubc(pcb_opctx_t *ctx, pcb_subc_t *sc)
+void *pcb_subcop_change_flag(pcb_opctx_t *ctx, pcb_subc_t *sc)
 {
 	if ((ctx->chgflag.flag & PCB_SUBC_FLAGS) != ctx->chgflag.flag)
 		return NULL;
Index: trunk/src/obj_subc_op.h
===================================================================
--- trunk/src/obj_subc_op.h	(revision 9330)
+++ trunk/src/obj_subc_op.h	(revision 9331)
@@ -28,28 +28,28 @@
 
 #include "operation.h"
 
-void *CopySubc(pcb_opctx_t *ctx, pcb_subc_t *src);
-void *MoveSubc(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *Rotate90Subc(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *MoveSubcToBuffer(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *AddSubcToBuffer(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *ChangeSubcSize(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *ChangeSubcClearSize(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *ChangeSubc1stSize(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *ChangeSubc2ndSize(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *ChangeSubcNonetlist(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *ChangeSubcName(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *DestroySubc(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *RemoveSubc_op(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_copy(pcb_opctx_t *ctx, pcb_subc_t *src);
+void *pcb_subcop_move(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_rotate90(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_move_to_buffer(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_add_to_buffer(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_change_size(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_change_clear_size(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_change_1st_size(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_change_2nd_size(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_change_nonetlist(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_change_name(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_destroy(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_remove(pcb_opctx_t *ctx, pcb_subc_t *sc);
 
-void *ClrSubcOctagon(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *SetSubcOctagon(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *ChangeSubcOctagon(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *ClrSubcSquare(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *SetSubcSquare(pcb_opctx_t *ctx, pcb_subc_t *sc);
-void *ChangeSubcSquare(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_clear_octagon(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_set_octagon(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_change_octagon(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_clear_square(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_set_square(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_change_square(pcb_opctx_t *ctx, pcb_subc_t *sc);
 
-void *ChgFlagSubc(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_change_flag(pcb_opctx_t *ctx, pcb_subc_t *sc);
 
 
 #endif
Index: trunk/src/remove.c
===================================================================
--- trunk/src/remove.c	(revision 9330)
+++ trunk/src/remove.c	(revision 9331)
@@ -53,7 +53,7 @@
 	pcb_arcop_remve,
 	pcb_ratop_remove,
 	pcb_arcop_remove_point,
-	RemoveSubc_op
+	pcb_subcop_remove
 };
 
 static pcb_opfunc_t DestroyFunctions = {
@@ -70,7 +70,7 @@
 	pcb_arcop_destroy,
 	pcb_ratop_destroy,
 	NULL,
-	DestroySubc
+	pcb_subcop_destroy
 };
 
 /* ----------------------------------------------------------------------
Index: trunk/src/rotate.c
===================================================================
--- trunk/src/rotate.c	(revision 9330)
+++ trunk/src/rotate.c	(revision 9331)
@@ -66,7 +66,7 @@
 	pcb_arcop_rotate90,
 	NULL,
 	NULL,
-	Rotate90Subc
+	pcb_subcop_rotate90
 };
 
 /* ---------------------------------------------------------------------------