Index: abi/include/abi/errno.h
===================================================================
--- abi/include/abi/errno.h	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ abi/include/abi/errno.h	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -62,5 +62,5 @@
 #define EPARTY         -8
 
-#define EEXISTS        -9   /* Entry already exists */
+#define EEXIST         -9   /* Entry already exists */
 #define EBADMEM        -10  /* Bad memory pointer */
 #define ENOTSUP        -11  /* Not supported */
Index: kernel/generic/src/ipc/event.c
===================================================================
--- kernel/generic/src/ipc/event.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ kernel/generic/src/ipc/event.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -251,5 +251,5 @@
  *
  * @return EOK if the subscription was successful.
- * @return EEXISTS if the notifications of the given type are
+ * @return EEXIST if the notifications of the given type are
  *         already subscribed.
  *
@@ -269,5 +269,5 @@
 		res = EOK;
 	} else
-		res = EEXISTS;
+		res = EEXIST;
 	
 	spinlock_unlock(&event->lock);
@@ -282,5 +282,5 @@
  *
  * @return EOK if the subscription was successful.
- * @return EEXISTS if the notifications of the given type are
+ * @return EEXIST if the notifications of the given type are
  *         already subscribed.
  *
@@ -334,5 +334,5 @@
  * @return EOK on success.
  * @return ELIMIT on unknown event type.
- * @return EEXISTS if the notifications of the given type are
+ * @return EEXIST if the notifications of the given type are
  *         already subscribed.
  *
Index: kernel/generic/src/ipc/irq.c
===================================================================
--- kernel/generic/src/ipc/irq.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ kernel/generic/src/ipc/irq.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -351,5 +351,5 @@
 		
 		free(irq);
-		return EEXISTS;
+		return EEXIST;
 	}
 	
Index: uspace/app/bdsh/errors.h
===================================================================
--- uspace/app/bdsh/errors.h	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/app/bdsh/errors.h	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -42,5 +42,5 @@
 #define CL_ENOTSUP 6
 #define CL_EEXEC   7
-#define CL_EEXISTS 8
+#define CL_EEXIST  8
 #define CL_ETOOBIG 9
 
Index: uspace/app/trace/errors.c
===================================================================
--- uspace/app/trace/errors.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/app/trace/errors.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -46,5 +46,5 @@
 	[-EPERM]	= { "EPERM",		"Permission denied" },
 	[-EHANGUP]	= { "EHANGUP",		"Answerbox closed connection" },
-	[-EEXISTS]	= { "EEXISTS",		"Entry already exists" },
+	[-EEXIST]	= { "EEXIST",		"Entry already exists" },
 	[-EBADMEM]	= { "EBADMEM",		"Bad memory pointer" },
 
Index: uspace/app/untar/main.c
===================================================================
--- uspace/app/untar/main.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/app/untar/main.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -104,5 +104,5 @@
 {
 	int rc = mkdir(header->filename, 0755);
-	if ((rc == EEXIST) || (rc == EEXISTS)) {
+	if (rc == EEXIST) {
 		// printf("Note: directory %s already exists.\n", header->filename);
 		rc = EOK;
Index: uspace/app/vuhid/device.c
===================================================================
--- uspace/app/vuhid/device.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/app/vuhid/device.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -123,5 +123,5 @@
 	/* Already used interface. */
 	if (iface->vuhid_data != NULL) {
-		return EEXISTS;
+		return EEXIST;
 	}
 
Index: uspace/drv/test/test1/test1.c
===================================================================
--- uspace/drv/test/test1/test1.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/drv/test/test1/test1.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -186,5 +186,5 @@
 		(void) register_fun_verbose(dev,
 		    "cloning myself twice ;-)", "clone",
-		    "virtual&test1", 10, EEXISTS, NULL);
+		    "virtual&test1", 10, EEXIST, NULL);
 	} else if (str_cmp(dev_name, "clone") == 0) {
 		(void) register_fun_verbose(dev,
Index: uspace/lib/c/include/errno.h
===================================================================
--- uspace/lib/c/include/errno.h	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/lib/c/include/errno.h	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -47,5 +47,4 @@
 #define ENOTDIR       (-258)
 #define ENOSPC        (-259)
-#define EEXIST        (-260)
 #define ENOTEMPTY     (-261)
 #define EBADF         (-262)
Index: uspace/lib/drv/generic/driver.c
===================================================================
--- uspace/lib/drv/generic/driver.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/lib/drv/generic/driver.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -945,5 +945,5 @@
 	if (rc != EOK) {
 		printf("Error: Failed to register driver with device manager "
-		    "(%s).\n", (rc == EEXISTS) ? "driver already started" :
+		    "(%s).\n", (rc == EEXIST) ? "driver already started" :
 		    str_error(rc));
 		
Index: uspace/lib/nettl/src/amap.c
===================================================================
--- uspace/lib/nettl/src/amap.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/lib/nettl/src/amap.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -349,5 +349,5 @@
  * @param aepp Place to store actual endpoint pair, possibly with allocated port
  *
- * @return EOK on success, EEXISTS if conflicting epp exists,
+ * @return EOK on success, EEXIST if conflicting epp exists,
  *         ENOMEM if out of memory
  */
@@ -394,5 +394,5 @@
  * @param aepp Place to store actual endpoint pair, possibly with allocated port
  *
- * @return EOK on success, EEXISTS if conflicting epp exists,
+ * @return EOK on success, EEXIST if conflicting epp exists,
  *         ENOMEM if out of memory
  */
@@ -438,5 +438,5 @@
  * @param aepp Place to store actual endpoint pair, possibly with allocated port
  *
- * @return EOK on success, EEXISTS if conflicting epp exists,
+ * @return EOK on success, EEXIST if conflicting epp exists,
  *         ENOMEM if out of memory
  */
@@ -482,5 +482,5 @@
  * @param aepp Place to store actual endpoint pair, possibly with allocated port
  *
- * @return EOK on success, EEXISTS if conflicting epp exists,
+ * @return EOK on success, EEXIST if conflicting epp exists,
  *         ENOMEM if out of memory
  */
@@ -515,5 +515,5 @@
  * @param aepp Place to store actual endpoint pair, possibly with allocated port
  *
- * @return EOK on success, EEXISTS if conflicting epp exists,
+ * @return EOK on success, EEXIST if conflicting epp exists,
  *         ENOMEM if out of memory
  */
Index: uspace/lib/nettl/src/portrng.c
===================================================================
--- uspace/lib/nettl/src/portrng.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/lib/nettl/src/portrng.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -88,5 +88,5 @@
  * @param apnum Place to store allocated port number
  *
- * @return EOK on success, ENOENT if no free port number found, EEXISTS
+ * @return EOK on success, ENOENT if no free port number found, EEXIST
  *         if @a pnum is specified but it is already allocated,
  *         EINVAL if @a pnum is specified from the system range, but
@@ -137,5 +137,5 @@
 			if (port->pn == pnum) {
 				log_msg(LOG_DEFAULT, LVL_DEBUG2, "port already used");
-				return EEXISTS;
+				return EEXIST;
 			}
 		}
Index: uspace/lib/usbdev/src/pipesinit.c
===================================================================
--- uspace/lib/usbdev/src/pipesinit.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/lib/usbdev/src/pipesinit.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -190,5 +190,5 @@
 
 	if (ep_mapping->present) {
-		return EEXISTS;
+		return EEXIST;
 	}
 
Index: uspace/lib/usbhost/src/usb_device_manager.c
===================================================================
--- uspace/lib/usbhost/src/usb_device_manager.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/lib/usbhost/src/usb_device_manager.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -150,5 +150,5 @@
 	if (instance->devices[address].handle != 0) {
 		fibril_mutex_unlock(&instance->guard);
-		return EEXISTS;
+		return EEXIST;
 	}
 	instance->devices[address].handle = handle;
Index: uspace/lib/usbhost/src/usb_endpoint_manager.c
===================================================================
--- uspace/lib/usbhost/src/usb_endpoint_manager.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/lib/usbhost/src/usb_endpoint_manager.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -253,5 +253,5 @@
 	if (endpoint != NULL) {
 		fibril_mutex_unlock(&instance->guard);
-		return EEXISTS;
+		return EEXIST;
 	}
 	list_append(&ep->link, get_list(instance, ep->address));
@@ -339,5 +339,5 @@
 	if (ep != NULL) {
 		fibril_mutex_unlock(&instance->guard);
-		return EEXISTS;
+		return EEXIST;
 	}
 
Index: uspace/srv/audio/hound/audio_sink.c
===================================================================
--- uspace/srv/audio/hound/audio_sink.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/srv/audio/hound/audio_sink.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -103,5 +103,5 @@
 	if (!pcm_format_is_any(&sink->format)) {
 		log_debug("Sink %s already has a format", sink->name);
-		return EEXISTS;
+		return EEXIST;
 	}
 	const pcm_format_t old_format = sink->format;
Index: uspace/srv/audio/hound/hound.c
===================================================================
--- uspace/srv/audio/hound/hound.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/srv/audio/hound/hound.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -267,5 +267,5 @@
 		if (dev->id == id) {
 			log_debug("Device with id %zu is already present", id);
-			return EEXISTS;
+			return EEXIST;
 		}
 	}
@@ -274,5 +274,5 @@
 	if (dev) {
 		log_debug("Device with name %s is already present", name);
-		return EEXISTS;
+		return EEXIST;
 	}
 
@@ -341,5 +341,5 @@
 		log_debug("Source by that name already exists");
 		fibril_mutex_unlock(&hound->list_guard);
-		return EEXISTS;
+		return EEXIST;
 	}
 	list_append(&source->link, &hound->sources);
@@ -365,5 +365,5 @@
 		log_debug("Sink by that name already exists");
 		fibril_mutex_unlock(&hound->list_guard);
-		return EEXISTS;
+		return EEXIST;
 	}
 	list_append(&sink->link, &hound->sinks);
Index: uspace/srv/devman/drv_conn.c
===================================================================
--- uspace/srv/devman/drv_conn.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/srv/devman/drv_conn.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -101,5 +101,5 @@
 		    driver->name);
 		fibril_mutex_unlock(&driver->driver_mutex);
-		async_answer_0(callid, EEXISTS);
+		async_answer_0(callid, EEXIST);
 		return NULL;
 	}
@@ -278,5 +278,5 @@
 		fibril_rwlock_write_unlock(&tree->rwlock);
 		dev_del_ref(pdev);
-		async_answer_0(callid, EEXISTS);
+		async_answer_0(callid, EEXIST);
 		printf(NAME ": Warning, driver tried to register `%s' twice.\n",
 		    fun_name);
Index: uspace/srv/locsrv/locsrv.c
===================================================================
--- uspace/srv/locsrv/locsrv.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/srv/locsrv/locsrv.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -412,5 +412,5 @@
 {
 	if (server == NULL)
-		return EEXISTS;
+		return EEXIST;
 	
 	fibril_mutex_lock(&servers_list_mutex);
@@ -511,5 +511,5 @@
 		free(service->name);
 		free(service);
-		async_answer_0(iid, EEXISTS);
+		async_answer_0(iid, EEXIST);
 		return;
 	}
@@ -951,5 +951,5 @@
 	    loc_namespace_find_id(IPC_GET_ARG1(*icall));
 	if (namespace == NULL)
-		async_answer_0(iid, EEXISTS);
+		async_answer_0(iid, EEXIST);
 	else
 		async_answer_1(iid, EOK, namespace->refcnt);
Index: uspace/srv/net/inetsrv/addrobj.c
===================================================================
--- uspace/srv/net/inetsrv/addrobj.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/srv/net/inetsrv/addrobj.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -87,5 +87,5 @@
 		/* Duplicate address name */
 		fibril_mutex_unlock(&addr_list_lock);
-		return EEXISTS;
+		return EEXIST;
 	}
 
Index: uspace/srv/net/tcp/conn.c
===================================================================
--- uspace/srv/net/tcp/conn.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/srv/net/tcp/conn.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -1223,5 +1223,5 @@
 		rc = amap_insert(amap, &conn->ident, conn, af_allow_system, &aepp);
 		if (rc != EOK) {
-			assert(rc != EEXISTS);
+			assert(rc != EEXIST);
 			assert(rc == ENOMEM);
 			log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory.");
Index: uspace/srv/ns/service.c
===================================================================
--- uspace/srv/ns/service.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/srv/ns/service.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -143,5 +143,5 @@
 {
 	if (hash_table_find(&service_hash_table, &service))
-		return EEXISTS;
+		return EEXIST;
 	
 	hashed_service_t *hashed_service =
Index: uspace/srv/ns/task.c
===================================================================
--- uspace/srv/ns/task.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/srv/ns/task.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -235,5 +235,5 @@
 	ht_link_t *link = hash_table_find(&phone_to_id, &call->in_phone_hash);
 	if (link != NULL)
-		return EEXISTS;
+		return EEXIST;
 	
 	p2i_entry_t *entry = (p2i_entry_t *) malloc(sizeof(p2i_entry_t));
Index: uspace/srv/vfs/vfs_register.c
===================================================================
--- uspace/srv/vfs/vfs_register.c	(revision a955fccc48da56c66c06fc89b21e01671d0bfc4e)
+++ uspace/srv/vfs/vfs_register.c	(revision 8a637a47d260c9852eb7bbefc705cba01e8ef051)
@@ -162,5 +162,5 @@
 		fibril_mutex_unlock(&fs_list_lock);
 		free(fs_info);
-		async_answer_0(rid, EEXISTS);
+		async_answer_0(rid, EEXIST);
 		return;
 	}