3 files changed, 6 insertions, 6 deletions
diff --git a/src/user/lib/draw/draw.c b/src/user/lib/draw/draw.c
index 95a8921..3fb6a99 100644
--- a/src/user/lib/draw/draw.c
+++ b/src/user/lib/draw/draw.c
@@ -43,11 +43,11 @@ int fb_setup(struct framebuf *fb, const char *base) {
 	fb->bpp = strtol(spec, &spec, 0);
 	if (fb->bpp != 32) return -EINVAL;
 
-	fb->len = _syscall_getsize(fb->fd);
+	fb->len = _sys_getsize(fb->fd);
 	fb->pitch = fb->len / fb->height;
 	fb->b = malloc(fb->len);
 
-	_syscall_read(fb->fd, fb->b, fb->len, 0);
+	_sys_read(fb->fd, fb->b, fb->len, 0);
 
 	return 0;
 }
diff --git a/src/user/lib/draw/draw.h b/src/user/lib/draw/draw.h
index 98316fe..5e614be 100644
--- a/src/user/lib/draw/draw.h
+++ b/src/user/lib/draw/draw.h
@@ -8,7 +8,7 @@ struct framebuf {
 	uint8_t bpp;
 	char *b;
 
-	handle_t fd;
+	hid_t fd;
 };
 
 struct rect { uint32_t x1, y1, x2, y2; };
diff --git a/src/user/lib/draw/flush.c b/src/user/lib/draw/flush.c
index 060fdaf..3b4a978 100644
--- a/src/user/lib/draw/flush.c
+++ b/src/user/lib/draw/flush.c
@@ -5,7 +5,7 @@
 static void flush_combined(struct rect pix, struct framebuf *fb) {
 	size_t low  = fb->pitch * pix.y1 + 4 * pix.x1;
 	size_t high = fb->pitch * pix.y2 + 4 * pix.y2 + 4;
-	_syscall_write(fb->fd, fb->b + low, high - low, low, 0);
+	_sys_write(fb->fd, fb->b + low, high - low, low, 0);
 }
 
 static void flush_split(struct rect pix, struct framebuf *fb) {
@@ -21,14 +21,14 @@ static void flush_split(struct rect pix, struct framebuf *fb) {
 		size_t high = fb->pitch * y + 4 * pix.x2 + 4;
 
 		execbuf[epos++] = EXECBUF_SYSCALL;
-		execbuf[epos++] = _SYSCALL_WRITE;
+		execbuf[epos++] = _SYS_WRITE;
 		execbuf[epos++] = fb->fd;
 		execbuf[epos++] = (uintptr_t)fb->b + low;
 		execbuf[epos++] = high - low;
 		execbuf[epos++] = low;
 		execbuf[epos++] = 0;
 	}
-	_syscall_execbuf(execbuf, epos * sizeof(uint64_t));
+	_sys_execbuf(execbuf, epos * sizeof(uint64_t));
 }
 
 void dirty_flush(struct rect *d, struct framebuf *fb) {