Index: boot/arch/arm32/Makefile.inc
===================================================================
--- boot/arch/arm32/Makefile.inc	(revision a5c82bb92d299e5af3902230abea1949c78f00c3)
+++ boot/arch/arm32/Makefile.inc	(revision f7cbc6f2e82da90c5886ed56796619d28a78c603)
@@ -42,6 +42,6 @@
 
 RD_SRVS_ESSENTIAL += \
-	$(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24ts \
-	$(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
+	$(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
+	$(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24xx_uart
 
 RD_SRVS_NON_ESSENTIAL += \
Index: uspace/app/init/init.c
===================================================================
--- uspace/app/init/init.c	(revision a5c82bb92d299e5af3902230abea1949c78f00c3)
+++ uspace/app/init/init.c	(revision f7cbc6f2e82da90c5886ed56796619d28a78c603)
@@ -302,6 +302,6 @@
 	spawn("/srv/obio");
 	srv_start("/srv/cuda_adb");
-	srv_start("/srv/s3c24ser");
-	srv_start("/srv/s3c24ts");
+	srv_start("/srv/s3c24xx_uart");
+	srv_start("/srv/s3c24xx_ts");
 	
 	spawn("/srv/loopip");
Index: uspace/srv/hid/input/port/chardev.c
===================================================================
--- uspace/srv/hid/input/port/chardev.c	(revision a5c82bb92d299e5af3902230abea1949c78f00c3)
+++ uspace/srv/hid/input/port/chardev.c	(revision f7cbc6f2e82da90c5886ed56796619d28a78c603)
@@ -63,5 +63,5 @@
 /** List of devices to try connecting to. */
 static const char *in_devs[] = {
-	"char/s3c24ser"
+	"char/s3c24xx_uart"
 };
 
Index: uspace/srv/hid/s3c24xx_ts/Makefile
===================================================================
--- uspace/srv/hid/s3c24xx_ts/Makefile	(revision a5c82bb92d299e5af3902230abea1949c78f00c3)
+++ uspace/srv/hid/s3c24xx_ts/Makefile	(revision f7cbc6f2e82da90c5886ed56796619d28a78c603)
@@ -29,6 +29,5 @@
 USPACE_PREFIX = ../../..
 
-# Need to use short name because of FAT 8+3 limit
-BINARY = s3c24ts
+BINARY = s3c24xx_ts
 
 SOURCES = \
Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c
===================================================================
--- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision a5c82bb92d299e5af3902230abea1949c78f00c3)
+++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision f7cbc6f2e82da90c5886ed56796619d28a78c603)
@@ -52,5 +52,5 @@
 #include "s3c24xx_ts.h"
 
-#define NAME       "s3c24ser"
+#define NAME       "s3c24xx_ts"
 #define NAMESPACE  "hid"