diff --git a/sndiod/dev.h b/sndiod/dev.h
index f8d9ca6..7894d44 100644
--- a/sndiod/dev.h
+++ b/sndiod/dev.h
@@ -147,7 +147,7 @@ struct dev {
 #define DEV_CFG		0			/* closed */
 #define DEV_INIT	1			/* stopped */
 #define DEV_RUN		3			/* playin & recording */
-	unsigned int pstate;			/* one of DEV_xxx */
+	unsigned int pstate;			/* one of above */
 	char *path;				/* sio path */
 
 	/*
diff --git a/sndiod/siofile.c b/sndiod/siofile.c
index 1b41b04..7eafc6b 100644
--- a/sndiod/siofile.c
+++ b/sndiod/siofile.c
@@ -267,10 +267,10 @@ siofile_start(struct siofile *f)
 		return;
 	}
 	if (d->mode & MODE_PLAY) {
-		f->state = STATE_CYCLE;
+		f->state = SIOFILE_CYCLE;
 		f->todo = 0;
 	} else {
-		f->state = STATE_REC;
+		f->state = SIOFILE_READ;
 		f->todo = d->round * d->rchan * d->par.bps;
 	}
 #ifdef DEBUG
@@ -315,7 +315,7 @@ siofile_pollfd(void *arg, struct pollfd *pfd)
 	struct siofile *f = arg;
 	int events;
 	
-	events = (f->state == STATE_REC) ? POLLIN : POLLOUT;
+	events = (f->state == SIOFILE_READ) ? POLLIN : POLLOUT;
 	return sio_pollfd(f->hdl, pfd, events);
 }
 
@@ -344,7 +344,7 @@ siofile_run(void *arg)
 		if (d->pstate != DEV_RUN)
 			return;
 		switch (f->state) {
-		case STATE_REC:
+		case SIOFILE_READ:
 #ifdef DEBUG
 			if (!(f->events & POLLIN)) {
 				siofile_log(f);
@@ -375,20 +375,20 @@ siofile_run(void *arg)
 				panic();
 			}
 #endif
-			f->state = STATE_CYCLE;
+			f->state = SIOFILE_CYCLE;
 			break;
-		case STATE_CYCLE:
+		case SIOFILE_CYCLE:
 			dev_cycle(d);
 			if (d->mode & MODE_PLAY) {
-				f->state = STATE_PLAY;
+				f->state = SIOFILE_WRITE;
 				f->todo = d->round * d->pchan * d->par.bps;
 				break;
 			} else {
-				f->state = STATE_REC;
+				f->state = SIOFILE_READ;
 				f->todo = d->round * d->rchan * d->par.bps;
 				return;
 			}
-		case STATE_PLAY:
+		case SIOFILE_WRITE:
 			if (!siofile_play(f))
 				return;
 #ifdef DEBUG
@@ -416,10 +416,10 @@ siofile_run(void *arg)
 			if (d->poffs == d->bufsz)
 				d->poffs = 0;
 			if ((d->mode & MODE_REC) && d->prime == 0) {
-				f->state = STATE_REC;
+				f->state = SIOFILE_READ;
 				f->todo = d->round * d->rchan * d->par.bps;
 			} else
-				f->state = STATE_CYCLE;
+				f->state = SIOFILE_CYCLE;
 			return;
 		}
 	}
diff --git a/sndiod/siofile.h b/sndiod/siofile.h
index db49203..ef5d8f4 100644
--- a/sndiod/siofile.h
+++ b/sndiod/siofile.h
@@ -29,9 +29,9 @@ struct siofile {
 #endif
 	struct dev *dev;
 	struct file *file;
-#define STATE_REC	0
-#define STATE_CYCLE	1
-#define STATE_PLAY	2
+#define SIOFILE_READ	0
+#define SIOFILE_CYCLE	1
+#define SIOFILE_WRITE	2
 	int state;
 };