--- ./Builtins/Func.h Sun Oct  2 14:31:38 2005
+++ ./Builtins/Func.h Sun Oct  2 14:31:38 2005
@@ -11,9 +11,9 @@
 	unsigned int num_closure_vars;
 	Con_Obj *parent_closure;
 	Con_Obj *parent_module;
-} Con_Func_Obj;
+} Con_Func_Seg;
 
 Con_Obj *Con_Func_new(Con_EC_Obj *, bool, Con_PC, Con_PC_Type, unsigned int, Con_Obj *, Con_Obj *, Con_Obj *);
-void Con_Func_init_seg(Con_EC_Obj *, Con_Func_Obj *, bool, Con_PC, Con_PC_Type, unsigned int, Con_Obj *, Con_Obj *, Con_Obj *);
+void Con_Func_init_seg(Con_EC_Obj *, Con_Func_Seg *, bool, Con_PC, Con_PC_Type, unsigned int, Con_Obj *, Con_Obj *, Con_Obj *);
 
 #endif

--- ./Builtins/Func.c Sun Oct  2 14:31:38 2005
+++ ./Builtins/Func.c Sun Oct  2 14:31:38 2005
@@ -10,10 +10,10 @@
 
 Con_Obj * Con_Func_new(Con_EC_Obj *ec, bool is_bound, Con_PC pc, Con_PC_Type pc_type, unsigned int num_closure_vars, Con_Obj *parent_closure, Con_Obj *name, Con_Obj *parent_module)
 {
-	Con_Func_Obj * new_func;
+	Con_Func_Seg * new_func;
 	
 	CON_TRY {
-		new_func = (Con_Func_Obj *) Con_Memory_obj_malloc(ec, sizeof(Con_Func_Obj));	
+		new_func = (Con_Func_Seg *) Con_Memory_obj_malloc(ec, sizeof(Con_Func_Seg));	
 		Con_Func_init_seg(ec, new_func, is_bound, pc, pc_type, num_closure_vars, parent_closure, name, parent_module);
 	}
 	CON_CATCH {
@@ -27,7 +27,7 @@
 
 
 
-void Con_Func_init_seg(Con_EC_Obj *ec, Con_Func_Obj *func_seg, bool is_bound, Con_PC pc, Con_PC_Type pc_type, unsigned int num_closure_vars, Con_Obj *parent_closure, Con_Obj *name, Con_Obj *parent_module)
+void Con_Func_init_seg(Con_EC_Obj *ec, Con_Func_Seg *func_seg, bool is_bound, Con_PC pc, Con_PC_Type pc_type, unsigned int num_closure_vars, Con_Obj *parent_closure, Con_Obj *name, Con_Obj *parent_module)
 {	
 	func_seg->seg_c_class = ec->vm->builtins[CON_BUILTIN_FUNC_CLASS];
 	func_seg->is_bound = is_bound;

--- ./VM.c Sun Oct  2 14:31:38 2005
+++ ./VM.c Sun Oct  2 14:31:38 2005
@@ -183,12 +183,12 @@
 Con_Obj * Con_VM_apply(Con_EC_Obj *ec, Con_Obj *func)
 {
 	jmp_buf env;
-	Con_Func_Obj *func_seg;
+	Con_Func_Seg *func_seg;
 	Con_Obj *return_obj;
 
 	if ((func->seg_c_class != ec->vm->builtins[CON_BUILTIN_FUNC_CLASS])
 		return NULL;
-	func_seg = (Con_Func_Obj *) func;
+	func_seg = (Con_Func_Seg *) func;
 	
 	if (func_seg->pc_type == PC_TYPE_C_FUNCTION) {
 		if (sigsetjmp(env, 0) == 0) {