diff --git a/ulib.c b/ulib.c
index ce4e13d..994ceb9 100644
--- a/ulib.c
+++ b/ulib.c
@@ -25,10 +25,10 @@ strcmp(const char *p, const char *q)
 {
   while(*p && *p == *q)
     p++, q++;
-  return (int) ((unsigned char) *p - (unsigned char) *q);
+  return (uchar)*p - (uchar)*q;
 }
 
-unsigned int
+uint
 strlen(char *s)
 {
   int n = 0;
@@ -38,7 +38,7 @@ strlen(char *s)
 }
 
 void*
-memset(void *dst, int c, unsigned int n)
+memset(void *dst, int c, uint n)
 {
   char *d = (char*) dst;
 
diff --git a/user.h b/user.h
index 1bd512d..75687b6 100644
--- a/user.h
+++ b/user.h
@@ -27,8 +27,8 @@ char* strchr(const char*, char c);
 int strcmp(const char*, const char*);
 void printf(int, char*, ...);
 char* gets(char*, int max);
-unsigned int strlen(char*);
-void* memset(void*, int, unsigned int);
+uint strlen(char*);
+void* memset(void*, int, uint);
 void* malloc(uint);
 void free(void*);
 int atoi(const char*);
diff --git a/usertests.c b/usertests.c
index 16be8b0..beae189 100644
--- a/usertests.c
+++ b/usertests.c
@@ -654,7 +654,7 @@ concreate()
   int i, pid, n, fd;
   char fa[40];
   struct {
-    unsigned short inum;
+    ushort inum;
     char name[14];
   } de;