--- a/pack.c	Tue Nov 08 18:26:05 2011 +0100
+++ b/pack.c	Wed Nov 09 18:35:35 2011 +0100
@@ -293,20 +293,20 @@
  */
 
 int
-pack(int ptype, const char *path, const char *fmt, ...)
+pack_write(int ptype, const char *path, const char *fmt, ...)
 {
 	va_list ap;
 	int status;
 
 	va_start(ap, fmt);
-	status = vpack(ptype, path, fmt, ap);
+	status = pack_vwrite(ptype, path, fmt, ap);
 	va_end(ap);
 	
 	return status;
 }
 
 int
-vpack(int ptype, const char *path, const char *fmt, va_list ap)
+pack_vwrite(int ptype, const char *path, const char *fmt, va_list ap)
 {
 	FILE *fp;
 	int status;
@@ -314,7 +314,7 @@
 	if ((fp = fopen(path, "w+b")) == NULL)
 		return -1;
 
-	status = vfpack(ptype, fp, fmt, ap);
+	status = pack_vfwrite(ptype, fp, fmt, ap);
 	fclose(fp);
 
 	return status;
@@ -326,20 +326,20 @@
  */
 
 int
-fpack(int ptype, FILE *fp, const char *fmt, ...)
+pack_fwrite(int ptype, FILE *fp, const char *fmt, ...)
 {
 	va_list ap;
 	int status;
 
 	va_start(ap, fmt);
-	status = vfpack(ptype, fp, fmt, ap);
+	status = pack_vfwrite(ptype, fp, fmt, ap);
 	va_end(ap);
 
 	return status;
 }
 
 int
-vfpack(int ptype, FILE *fp, const char *fmt, va_list ap)
+pack_vfwrite(int ptype, FILE *fp, const char *fmt, va_list ap)
 {
 	struct item_list list;
 	int status;
@@ -368,20 +368,20 @@
  */
 
 int
-unpack(int ptype, const char *path, const char *fmt, ...)
+pack_read(int ptype, const char *path, const char *fmt, ...)
 {
 	va_list ap;
 	int status;
 
 	va_start(ap, fmt);
-	status = vunpack(ptype, path, fmt, ap);
+	status = pack_vread(ptype, path, fmt, ap);
 	va_end(ap);
 
 	return status;
 }
 
 int
-vunpack(int ptype, const char *path, const char *fmt, va_list ap)
+pack_vread(int ptype, const char *path, const char *fmt, va_list ap)
 {
 	FILE *fp;
 	int status;
@@ -389,7 +389,7 @@
 	if ((fp = fopen(path, "rb")) == NULL)
 		return -1;
 
-	status = vfunpack(ptype, fp, fmt, ap);
+	status = pack_vfread(ptype, fp, fmt, ap);
 	fclose(fp);
 
 	return status;
@@ -397,20 +397,20 @@
 }
 
 int
-funpack(int ptype, FILE *fp, const char *fmt, ...)
+pack_fread(int ptype, FILE *fp, const char *fmt, ...)
 {
 	va_list ap;
 	int status;
 
 	va_start(ap, fmt);
-	status = vfunpack(ptype, fp, fmt, ap);
+	status = pack_vfread(ptype, fp, fmt, ap);
 	va_end(ap);
 
 	return status;
 }
 
 int
-vfunpack(int ptype, FILE *fp, const char *fmt, va_list ap)
+pack_vfread(int ptype, FILE *fp, const char *fmt, va_list ap)
 {
 	const char *p;
 	void *ptr;