diff --git a/Makefile b/Makefile
index 731706f8faa4fdbf9098d12ddc641cb775d539f4..7d29767a37047f8c3c3c2359547a7bda9dea73da 100644
--- a/Makefile
+++ b/Makefile
@@ -26,14 +26,9 @@ HSRCS		= common_hilink.c
 common_hilink: ${HOBJS}
 	${CC} -c ${CFLAGS} ${HSRCS} -o ${HOBJS}
 
-ZCOBJS		= common_zte.o
-ZCSRCS		= common_zte.c
-common_zte: ${ZCOBJS}
-	${CC} -c ${ZCSRCS} -o ${ZCOBJS}
-
-STOBJS		= stack.o
-STSRCS		= stack.c
-stack: ${STOBJS}
+STOBJS		= stack_operations.o
+STSRCS		= stack_operations.c
+stack_operations: ${STOBJS}
 	${CC} -c ${STSRCS} -o ${STOBJS}
 
 DIOBJS		= dongle_infrastructure.o
diff --git a/dongle_infrastructure.c b/dongle_infrastructure.c
index 188759bb294ad63a3bf718852c232f009c1a62e7..409bd29bea7c2bc6dab3c4cbf90cef5262693d56 100644
--- a/dongle_infrastructure.c
+++ b/dongle_infrastructure.c
@@ -16,7 +16,7 @@
 
 #include "dongle_infrastructure.h"
 #include "dongle.h"
-#include "stack.h"
+#include "stack_operations.h"
 
 
 struct ubus_object *dongle_create_dynamic_object(struct device *dev_instance);
diff --git a/stack.c b/stack_operations.c
similarity index 100%
rename from stack.c
rename to stack_operations.c
diff --git a/stack.h b/stack_operations.h
similarity index 93%
rename from stack.h
rename to stack_operations.h
index 39db7ba520daef00f17abfbfad40dcf8eee3ba0e..36f55c2e84351668086a407d42f6062cc5aeaf69 100644
--- a/stack.h
+++ b/stack_operations.h
@@ -1,6 +1,6 @@
 #ifndef DFS_H
 #define DFS_H
-#include "common_zte.h"
+#include "common.h"
 
 struct directory {
 	struct list_head list;