diff --git a/offloading_binaries/TCPReceiver_mobile/TCPReceiver_mobile b/offloading_binaries/TCPReceiver_mobile/TCPReceiver_mobile
deleted file mode 100755
index 63c2997..0000000
Binary files a/offloading_binaries/TCPReceiver_mobile/TCPReceiver_mobile and /dev/null differ
diff --git a/offloading_binaries/TCPReceiver_mobile/main.o b/offloading_binaries/TCPReceiver_mobile/main.o
deleted file mode 100644
index 3401c9a..0000000
Binary files a/offloading_binaries/TCPReceiver_mobile/main.o and /dev/null differ
diff --git a/offloading_binaries/c2s_normaltcp_splice/splice b/offloading_binaries/c2s_normaltcp_splice/splice
deleted file mode 100755
index 7cdec1d..0000000
Binary files a/offloading_binaries/c2s_normaltcp_splice/splice and /dev/null differ
diff --git a/offloading_binaries/c2s_readfile_only/Makefile b/offloading_binaries/c2s_readfile_only/Makefile
deleted file mode 100644
index 26289cd..0000000
--- a/offloading_binaries/c2s_readfile_only/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-CC = arm-linux-androideabi-gcc
-# CC = gcc
-CFLAGS = -pie -fPIE
-TARGET = c2s_readfile_only
-
-OBJS = $(patsubst %.c, %.o, $(wildcard *.c))
-HEADERS = $(wildcard *.h)
-
-all: $(TARGET)
-
-%.o: %.c $(HEADERS)
-	$(CC) $(CFLAGS) -c $< -o $@
-
-.PRECIOUS: $(TARGET) $(OBJS)
-
-$(TARGET): $(OBJS)
-	$(CC) $(OBJS) -Wall $(CFLAGS) -o $@
-
-clean:
-	-rm -f *.o
-	-rm -f $(TARGET)
diff --git a/offloading_binaries/c2s_normaltcp_splice/Makefile b/offloading_binaries/client_readfile_only/Makefile
similarity index 91%
rename from offloading_binaries/c2s_normaltcp_splice/Makefile
rename to offloading_binaries/client_readfile_only/Makefile
index d1954c8..c526a0c 100644
--- a/offloading_binaries/c2s_normaltcp_splice/Makefile
+++ b/offloading_binaries/client_readfile_only/Makefile
@@ -1,7 +1,7 @@
 CC = arm-linux-androideabi-gcc
 # CC = gcc
 CFLAGS = -pie -fPIE
-TARGET = c2s_normaltcp_splice
+TARGET = client_readfile_only
 
 OBJS = $(patsubst %.c, %.o, $(wildcard *.c))
 HEADERS = $(wildcard *.h)
diff --git a/offloading_binaries/c2s_readfile_only/c2s_readfile_only b/offloading_binaries/client_readfile_only/client_readfile_only
similarity index 100%
rename from offloading_binaries/c2s_readfile_only/c2s_readfile_only
rename to offloading_binaries/client_readfile_only/client_readfile_only
diff --git a/offloading_binaries/c2s_readfile_only/main.c b/offloading_binaries/client_readfile_only/main.c
similarity index 91%
rename from offloading_binaries/c2s_readfile_only/main.c
rename to offloading_binaries/client_readfile_only/main.c
index 17b7352..dd1ba70 100644
--- a/offloading_binaries/c2s_readfile_only/main.c
+++ b/offloading_binaries/client_readfile_only/main.c
@@ -20,18 +20,6 @@
 #include <netinet/in.h>
 #include <fcntl.h>
 
-// #define ETH_P_IP        0x0800      /* Internet Protocol packet */
-// #define ETH_ALEN        6       /* from <net/ethernet.h> */
-// #define ETH_P_ALL       0x0003
-
-// #define MY_DEST_MAC0    0xba
-// #define MY_DEST_MAC1    0xf6
-// #define MY_DEST_MAC2    0xb1
-// #define MY_DEST_MAC3    0x71
-// #define MY_DEST_MAC4    0x09
-// #define MY_DEST_MAC5    0x64
- 
-// #define DEFAULT_IF      "wlan0"
 #define BUF_SIZ         4096
 
 char isNumber(char number[])
diff --git a/offloading_binaries/c2s_readfile_only/main.o b/offloading_binaries/client_readfile_only/main.o
similarity index 100%
rename from offloading_binaries/c2s_readfile_only/main.o
rename to offloading_binaries/client_readfile_only/main.o
diff --git a/offloading_binaries/c2s_normaltcp/Makefile b/offloading_binaries/client_send_bypassl3/Makefile
similarity index 91%
rename from offloading_binaries/c2s_normaltcp/Makefile
rename to offloading_binaries/client_send_bypassl3/Makefile
index 64dde7d..35a5456 100644
--- a/offloading_binaries/c2s_normaltcp/Makefile
+++ b/offloading_binaries/client_send_bypassl3/Makefile
@@ -1,7 +1,7 @@
 CC = arm-linux-androideabi-gcc
 # CC = gcc
 CFLAGS = -pie -fPIE
-TARGET = c2s_normaltcp
+TARGET = client_send_bypassl3
 
 OBJS = $(patsubst %.c, %.o, $(wildcard *.c))
 HEADERS = $(wildcard *.h)
diff --git a/offloading_binaries/c2s_bypassl3/c2s_bypassl3 b/offloading_binaries/client_send_bypassl3/client_send_bypassl3
similarity index 100%
rename from offloading_binaries/c2s_bypassl3/c2s_bypassl3
rename to offloading_binaries/client_send_bypassl3/client_send_bypassl3
diff --git a/offloading_binaries/c2s_bypassl3/main.c b/offloading_binaries/client_send_bypassl3/main.c
similarity index 100%
rename from offloading_binaries/c2s_bypassl3/main.c
rename to offloading_binaries/client_send_bypassl3/main.c
diff --git a/offloading_binaries/c2s_bypassl3/main.o b/offloading_binaries/client_send_bypassl3/main.o
similarity index 100%
rename from offloading_binaries/c2s_bypassl3/main.o
rename to offloading_binaries/client_send_bypassl3/main.o
diff --git a/offloading_binaries/c2s_normaludp/Makefile b/offloading_binaries/client_send_normaltcp/Makefile
similarity index 91%
rename from offloading_binaries/c2s_normaludp/Makefile
rename to offloading_binaries/client_send_normaltcp/Makefile
index 98edc26..528a6bf 100644
--- a/offloading_binaries/c2s_normaludp/Makefile
+++ b/offloading_binaries/client_send_normaltcp/Makefile
@@ -1,7 +1,7 @@
 CC = arm-linux-androideabi-gcc
 # CC = gcc
 CFLAGS = -pie -fPIE
-TARGET = c2s_normaludp
+TARGET = client_send_normaltcp
 
 OBJS = $(patsubst %.c, %.o, $(wildcard *.c))
 HEADERS = $(wildcard *.h)
diff --git a/offloading_binaries/c2s_normaltcp/c2s_normaltcp b/offloading_binaries/client_send_normaltcp/client_send_normaltcp
similarity index 100%
rename from offloading_binaries/c2s_normaltcp/c2s_normaltcp
rename to offloading_binaries/client_send_normaltcp/client_send_normaltcp
diff --git a/offloading_binaries/c2s_normaltcp/main.c b/offloading_binaries/client_send_normaltcp/main.c
similarity index 93%
rename from offloading_binaries/c2s_normaltcp/main.c
rename to offloading_binaries/client_send_normaltcp/main.c
index d22a141..3edb122 100644
--- a/offloading_binaries/c2s_normaltcp/main.c
+++ b/offloading_binaries/client_send_normaltcp/main.c
@@ -20,18 +20,6 @@
 #include <netinet/in.h>
 #include <fcntl.h>
 
-// #define ETH_P_IP        0x0800      /* Internet Protocol packet */
-// #define ETH_ALEN        6       /* from <net/ethernet.h> */
-// #define ETH_P_ALL       0x0003
-
-// #define MY_DEST_MAC0    0xba
-// #define MY_DEST_MAC1    0xf6
-// #define MY_DEST_MAC2    0xb1
-// #define MY_DEST_MAC3    0x71
-// #define MY_DEST_MAC4    0x09
-// #define MY_DEST_MAC5    0x64
- 
-// #define DEFAULT_IF      "wlan0"
 #define BUF_SIZ         65536
 
 char isNumber(char number[])
diff --git a/offloading_binaries/c2s_normaltcp/main.o b/offloading_binaries/client_send_normaltcp/main.o
similarity index 100%
rename from offloading_binaries/c2s_normaltcp/main.o
rename to offloading_binaries/client_send_normaltcp/main.o
diff --git a/offloading_binaries/client_send_normaltcp_sendfile/Makefile b/offloading_binaries/client_send_normaltcp_sendfile/Makefile
new file mode 100644
index 0000000..0a3dccf
--- /dev/null
+++ b/offloading_binaries/client_send_normaltcp_sendfile/Makefile
@@ -0,0 +1,21 @@
+CC = arm-linux-androideabi-gcc
+# CC = gcc
+CFLAGS = -pie -fPIE
+TARGET = client_send_normaltcp_sendfile
+
+OBJS = $(patsubst %.c, %.o, $(wildcard *.c))
+HEADERS = $(wildcard *.h)
+
+all: $(TARGET)
+
+%.o: %.c $(HEADERS)
+	$(CC) $(CFLAGS) -c $< -o $@
+
+.PRECIOUS: $(TARGET) $(OBJS)
+
+$(TARGET): $(OBJS)
+	$(CC) $(OBJS) -Wall $(CFLAGS) -o $@
+
+clean:
+	-rm -f *.o
+	-rm -f $(TARGET)
diff --git a/offloading_binaries/c2s_normaltcp_sendfile/c2s_normaltcp_sendfile b/offloading_binaries/client_send_normaltcp_sendfile/client_send_normaltcp_sendfile
similarity index 100%
rename from offloading_binaries/c2s_normaltcp_sendfile/c2s_normaltcp_sendfile
rename to offloading_binaries/client_send_normaltcp_sendfile/client_send_normaltcp_sendfile
diff --git a/offloading_binaries/c2s_normaltcp_sendfile/main.c b/offloading_binaries/client_send_normaltcp_sendfile/main.c
similarity index 99%
rename from offloading_binaries/c2s_normaltcp_sendfile/main.c
rename to offloading_binaries/client_send_normaltcp_sendfile/main.c
index c92c6f3..f2e0f59 100644
--- a/offloading_binaries/c2s_normaltcp_sendfile/main.c
+++ b/offloading_binaries/client_send_normaltcp_sendfile/main.c
@@ -27,7 +27,6 @@
 #include <netinet/in.h>
 #include <fcntl.h>
 
-// #define DEFAULT_IF  "lo"
 // #define BUF_SIZ     8192
 
 char isNumber(char number[])
@@ -80,7 +79,7 @@ int main(int argc, char *argv[])
     // set sendsize (if larger than 1460 will do packetization (fragmentation))
     if (argc > 5)
         sendsize = atoi(argv[5]);
-    
+
     // adjust slotLength to address packet size issue in the end
     if ((quota % sendsize) > 0)
     {
diff --git a/offloading_binaries/c2s_normaltcp_sendfile/main.o b/offloading_binaries/client_send_normaltcp_sendfile/main.o
similarity index 100%
rename from offloading_binaries/c2s_normaltcp_sendfile/main.o
rename to offloading_binaries/client_send_normaltcp_sendfile/main.o
diff --git a/offloading_binaries/c2s_normaltcp_sendfile/Makefile b/offloading_binaries/client_send_normaltcp_splice/Makefile
similarity index 89%
rename from offloading_binaries/c2s_normaltcp_sendfile/Makefile
rename to offloading_binaries/client_send_normaltcp_splice/Makefile
index 4bc9e88..300a634 100644
--- a/offloading_binaries/c2s_normaltcp_sendfile/Makefile
+++ b/offloading_binaries/client_send_normaltcp_splice/Makefile
@@ -1,7 +1,7 @@
 CC = arm-linux-androideabi-gcc
 # CC = gcc
 CFLAGS = -pie -fPIE
-TARGET = c2s_normaltcp_sendfile
+TARGET = client_send_normaltcp_splice
 
 OBJS = $(patsubst %.c, %.o, $(wildcard *.c))
 HEADERS = $(wildcard *.h)
diff --git a/offloading_binaries/c2s_normaltcp_splice/c2s_normaltcp_splice b/offloading_binaries/client_send_normaltcp_splice/client_send_normaltcp_splice
similarity index 100%
rename from offloading_binaries/c2s_normaltcp_splice/c2s_normaltcp_splice
rename to offloading_binaries/client_send_normaltcp_splice/client_send_normaltcp_splice
diff --git a/offloading_binaries/c2s_normaltcp_splice/main.c b/offloading_binaries/client_send_normaltcp_splice/main.c
similarity index 93%
rename from offloading_binaries/c2s_normaltcp_splice/main.c
rename to offloading_binaries/client_send_normaltcp_splice/main.c
index 2d2b987..e94aa6f 100644
--- a/offloading_binaries/c2s_normaltcp_splice/main.c
+++ b/offloading_binaries/client_send_normaltcp_splice/main.c
@@ -21,19 +21,7 @@
 #include <fcntl.h>
 #include <sys/uio.h>
 #include <netinet/tcp.h>
-// #define _GNU_SOURCE         /* See feature_test_macros(7) */
 
-// #define ETH_P_IP    0x0800      /* Internet Protocol packet */
-// #define ETH_ALEN    6       /* from <net/ethernet.h> */
-// #define ETH_P_ALL       0x0003
-
-// #define MY_DEST_MAC0    0xba
-// #define MY_DEST_MAC1    0xf6
-// #define MY_DEST_MAC2    0xb1
-// #define MY_DEST_MAC3    0x71
-// #define MY_DEST_MAC4    0x09
-// #define MY_DEST_MAC5    0x64
- 
 // #define DEFAULT_IF  "lo"
 // #define BUF_SIZ     8192
 
@@ -91,7 +79,7 @@ int main(int argc, char *argv[])
     // set sendsize (if larger than 1460 will do packetization (fragmentation))
     if (argc > 5)
         sendsize = atoi(argv[5]);
-    
+
     // adjust slotLength to address packet size issue in the end
     if ((quota % sendsize) > 0)
     {
diff --git a/offloading_binaries/c2s_normaltcp_splice/main.o b/offloading_binaries/client_send_normaltcp_splice/main.o
similarity index 100%
rename from offloading_binaries/c2s_normaltcp_splice/main.o
rename to offloading_binaries/client_send_normaltcp_splice/main.o
diff --git a/offloading_binaries/c2s_bypassl3/Makefile b/offloading_binaries/client_send_normaludp/Makefile
similarity index 91%
rename from offloading_binaries/c2s_bypassl3/Makefile
rename to offloading_binaries/client_send_normaludp/Makefile
index f513991..c73b9cd 100644
--- a/offloading_binaries/c2s_bypassl3/Makefile
+++ b/offloading_binaries/client_send_normaludp/Makefile
@@ -1,7 +1,7 @@
 CC = arm-linux-androideabi-gcc
 # CC = gcc
 CFLAGS = -pie -fPIE
-TARGET = c2s_bypassl3
+TARGET = client_send_normaludp
 
 OBJS = $(patsubst %.c, %.o, $(wildcard *.c))
 HEADERS = $(wildcard *.h)
diff --git a/offloading_binaries/c2s_normaludp/c2s_normaludp b/offloading_binaries/client_send_normaludp/client_send_normaludp
similarity index 100%
rename from offloading_binaries/c2s_normaludp/c2s_normaludp
rename to offloading_binaries/client_send_normaludp/client_send_normaludp
diff --git a/offloading_binaries/c2s_normaludp/main.c b/offloading_binaries/client_send_normaludp/main.c
similarity index 93%
rename from offloading_binaries/c2s_normaludp/main.c
rename to offloading_binaries/client_send_normaludp/main.c
index bcbf5dc..80cd359 100644
--- a/offloading_binaries/c2s_normaludp/main.c
+++ b/offloading_binaries/client_send_normaludp/main.c
@@ -21,18 +21,6 @@
 #include <netinet/in.h>
 #include <fcntl.h>
 
-// #define ETH_P_IP        0x0800      /* Internet Protocol packet */
-// #define ETH_ALEN        6       /* from <net/ethernet.h> */
-// #define ETH_P_ALL       0x0003
-
-// #define MY_DEST_MAC0    0xba
-// #define MY_DEST_MAC1    0xf6
-// #define MY_DEST_MAC2    0xb1
-// #define MY_DEST_MAC3    0x71
-// #define MY_DEST_MAC4    0x09
-// #define MY_DEST_MAC5    0x64
- 
-// #define DEFAULT_IF      "wlan0"
 #define BUF_SIZ         65536
 
 char isNumber(char number[])
diff --git a/offloading_binaries/c2s_normaludp/main.o b/offloading_binaries/client_send_normaludp/main.o
similarity index 100%
rename from offloading_binaries/c2s_normaludp/main.o
rename to offloading_binaries/client_send_normaludp/main.o
diff --git a/offloading_binaries/makeall.sh b/offloading_binaries/makeall.sh
index b6dbe32..37d8bf6 100644
--- a/offloading_binaries/makeall.sh
+++ b/offloading_binaries/makeall.sh
@@ -1,12 +1,12 @@
-cd c2s_normaltcp_sendfile && make clean && make
+cd client_send_normaltcp_sendfile && make clean && make
 cd ../
-cd c2s_normaltcp_splice && make clean && make
+cd client_send_normaltcp_splice && make clean && make
 cd ../
-cd c2s_bypassl3 && make clean && make
+cd client_send_bypassl3 && make clean && make
 cd ../
-cd c2s_normaludp && make clean && make
+cd client_send_normaludp && make clean && make
 cd ../
-cd c2s_normaltcp && make clean && make
+cd client_send_normaltcp && make clean && make
 cd ../
-cd c2s_readfile_only && make clean && make
+cd client_readfile_only && make clean && make
 cd ../
diff --git a/offloading_binaries/TCPReceiver_mobile/Makefile b/offloading_binaries/server_recv_normaltcp/Makefile
similarity index 90%
rename from offloading_binaries/TCPReceiver_mobile/Makefile
rename to offloading_binaries/server_recv_normaltcp/Makefile
index 8913c1d..22b2d9c 100644
--- a/offloading_binaries/TCPReceiver_mobile/Makefile
+++ b/offloading_binaries/server_recv_normaltcp/Makefile
@@ -1,7 +1,8 @@
 #CC = /media/Lucifer/android/lib/android-18-toolchain/bin/arm-linux-androideabi-gcc
 CC = arm-linux-androideabi-gcc
+# CC = gcc
 CFLAGS = -pie -fPIE
-TARGET = TCPReceiver_mobile
+TARGET = server_recv_normaltcp
 
 OBJS = $(patsubst %.c, %.o, $(wildcard *.c))
 HEADERS = $(wildcard *.h)
diff --git a/offloading_binaries/TCPReceiver_mobile/main.c b/offloading_binaries/server_recv_normaltcp/main.c
similarity index 100%
rename from offloading_binaries/TCPReceiver_mobile/main.c
rename to offloading_binaries/server_recv_normaltcp/main.c