Index: /trunk/xcache.c
===================================================================
--- /trunk/xcache.c	(revision 400)
+++ /trunk/xcache.c	(revision 402)
@@ -87,5 +87,5 @@
 
 static zend_bool xc_initized = 0;
-static zend_compile_file_t *origin_compile_file;
+static zend_compile_file_t *old_compile_file;
 static zend_llist_element  *xc_llist_zend_extension;
 
@@ -975,5 +975,5 @@
 
 	zend_try {
-		op_array = origin_compile_file(h, type TSRMLS_CC);
+		op_array = old_compile_file(h, type TSRMLS_CC);
 	} zend_catch {
 		catched = 1;
@@ -1181,5 +1181,5 @@
 	TRACE("type = %d\n", h->type);
 	if (!XG(cacher)) {
-		op_array = origin_compile_file(h, type TSRMLS_CC);
+		op_array = old_compile_file(h, type TSRMLS_CC);
 #ifdef HAVE_XCACHE_OPTIMIZER
 		if (XG(optimizer)) {
@@ -1195,5 +1195,5 @@
 	if (xc_entry_init_key_php(&xce, filename, opened_path_buffer TSRMLS_CC) != SUCCESS) {
 		TRACE("failed to init key for %s", filename);
-		return origin_compile_file(h, type TSRMLS_CC);
+		return old_compile_file(h, type TSRMLS_CC);
 	}
 	cache = xce.cache;
@@ -1203,5 +1203,5 @@
 	if (cache->compiling) {
 		cache->clogs ++;
-		return origin_compile_file(h, type TSRMLS_CC);
+		return old_compile_file(h, type TSRMLS_CC);
 	}
 	/* {{{ entry_lookup/hit/md5_init/php_lookup */
@@ -1257,5 +1257,5 @@
 	/* gaveup */
 	if (gaveup) {
-		return origin_compile_file(h, type TSRMLS_CC);
+		return old_compile_file(h, type TSRMLS_CC);
 	}
 	/* }}} */
@@ -1561,7 +1561,7 @@
 	xc_shm_t *shm = NULL;
 
-	if (origin_compile_file) {
-		zend_compile_file = origin_compile_file;
-		origin_compile_file = NULL;
+	if (old_compile_file) {
+		zend_compile_file = old_compile_file;
+		old_compile_file = NULL;
 	}
 
@@ -1605,5 +1605,5 @@
 
 		if (xc_php_size) {
-			origin_compile_file = zend_compile_file;
+			old_compile_file = zend_compile_file;
 			zend_compile_file = xc_compile_file;
 
Index: /trunk/coverager.c
===================================================================
--- /trunk/coverager.c	(revision 393)
+++ /trunk/coverager.c	(revision 402)
@@ -17,5 +17,5 @@
 
 static char *xc_coveragedump_dir = NULL;
-static zend_compile_file_t *origin_compile_file;
+static zend_compile_file_t *old_compile_file;
 
 #if 0
@@ -436,5 +436,5 @@
 	zend_op_array *op_array;
 
-	op_array = origin_compile_file(h, type TSRMLS_CC);
+	op_array = old_compile_file(h, type TSRMLS_CC);
 	if (op_array) {
 		if (XG(coverager)) {
@@ -465,5 +465,5 @@
 int xc_coverager_init(int module_number TSRMLS_DC) /* {{{ */
 {
-	origin_compile_file = zend_compile_file;
+	old_compile_file = zend_compile_file;
 	zend_compile_file = xc_compile_file_for_coverage;
 
@@ -485,6 +485,6 @@
 void xc_coverager_destroy() /* {{{ */
 {
-	if (origin_compile_file == xc_compile_file_for_coverage) {
-		zend_compile_file = origin_compile_file;
+	if (old_compile_file == xc_compile_file_for_coverage) {
+		zend_compile_file = old_compile_file;
 	}
 	if (xc_coveragedump_dir) {