diff --git a/INSTALL.md b/INSTALL.md
index 56f55bdf1..76013e1aa 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -11,12 +11,12 @@ Build from Git
 ==============
 
     test -f configure || autoreconf -iv
-    CFLAGS='-g3' ./configure --prefix=$HOME/Documents/git/cellwire/install
+    CFLAGS='-g3' ./configure --prefix=$HOME/Documents/git/nextepc/install
     make -j `nproc`
     sudo ip tuntap add name pgwtun mode tun
     sudo ./scripts/linux_netconfig.sh
-    sudo ./test/testcellwire
-    ./cellwired
+    sudo ./test/testnextepc
+    ./nextepcd
 
 
 
diff --git a/Makefile.am b/Makefile.am
index 754e56f0b..e3dcfb56a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,12 +4,12 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = lib src test
 
-bin_PROGRAMS = cellwired
+bin_PROGRAMS = nextepcd
 
-dist_cellwired_SOURCES = main.c 
+dist_nextepcd_SOURCES = main.c 
 
-cellwired_LDADD = \
-    $(top_srcdir)/src/libcellwire.la
+nextepcd_LDADD = \
+    $(top_srcdir)/src/libnextepc.la
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \
diff --git a/README.md b/README.md
index ce94dbc9b..a4d5b57ae 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-CellWire is an implementation of 3GPP EPC(MME, SGW, PGW, HSS)
+NextEPC is an implementation of 3GPP EPC(MME, SGW, PGW, HSS)
 
 The implementation consists in several components:
   - lib/core : the library contains the core of the framework.
diff --git a/configure.ac b/configure.ac
index e8d0f9fcb..05e114dba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ dnl This program is distributed in the hope that it will be useful, but
 dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-AC_INIT([CELLWIRE], [0.1.0], [acetcom@gmail.com])
+AC_INIT([NEXTEPC], [0.1.0], [acetcom@gmail.com])
 
 CORE_CONFIG_NICE(config.nice)
 
@@ -41,15 +41,15 @@ AC_SUBST(OSCPPFLAGS)
 AC_SUBST(OSDIR)
 
 AH_TOP([
-#ifndef __CELLWIRE_CONFIG_H__
-#define __CELLWIRE_CONFIG_H__
+#ifndef __NEXTEPC_CONFIG_H__
+#define __NEXTEPC_CONFIG_H__
 /* need this, because some autoconf tests rely on this (e.g. stpcpy)
  * and it should be used for new programs  */
 #define _GNU_SOURCE  1
 ])
 
 AH_BOTTOM([
-#endif /* __CELLWIRE_CONFIG_H__ */
+#endif /* __NEXTEPC_CONFIG_H__ */
 ])
 
 AH_VERBATIM([_REENTRANT],
@@ -323,7 +323,7 @@ AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 
 echo "
-CellWire configuration
+NextEPC configuration
 --------------------
 version                 : ${PACKAGE_VERSION}
 host                    : ${host}
diff --git a/lib/gtp/gtp_tlv.c b/lib/gtp/gtp_tlv.c
index 28586cac2..ef5455072 100644
--- a/lib/gtp/gtp_tlv.c
+++ b/lib/gtp/gtp_tlv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, CellWire Group
+ * Copyright (c) 2017, NextEPC Group
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/gtp/gtp_tlv.h b/lib/gtp/gtp_tlv.h
index 944e00e62..9f44b6b65 100644
--- a/lib/gtp/gtp_tlv.h
+++ b/lib/gtp/gtp_tlv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, CellWire Group
+ * Copyright (c) 2017, NextEPC Group
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/gtp/gtp_types.c b/lib/gtp/gtp_types.c
index f3a2a7005..587b2cee3 100644
--- a/lib/gtp/gtp_types.c
+++ b/lib/gtp/gtp_types.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, CellWire Group
+ * Copyright (c) 2017, NextEPC Group
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/gtp/support/README b/lib/gtp/support/README
index 9a283370b..7e2a33bc3 100644
--- a/lib/gtp/support/README
+++ b/lib/gtp/support/README
@@ -1,10 +1,10 @@
 
 * Install python-pip
-user@host ~/Documents/git/cellwire/lib/gtp/support$ \
+user@host ~/Documents/git/nextepc/lib/gtp/support$ \
     sudo apt-get install python-pip
 
 * Install python-docx
-user@host ~/Documents/git/cellwire/lib/gtp/support$ \
+user@host ~/Documents/git/nextepc/lib/gtp/support$ \
     sudo pip install python-docx
 
 * Change the format of standard specification 
@@ -12,5 +12,5 @@ user@host ~/Documents/git/cellwire/lib/gtp/support$ \
   using Microsoft Office 2007+
 
 * Generate TLV support files
-user@host ~/Documents/git/cellwire/lib/s1ap/support$ \
+user@host ~/Documents/git/nextepc/lib/s1ap/support$ \
     python gtp_tlv.py -f 29274-d80.docx -o ..
diff --git a/lib/gtp/support/gtp_tlv.py b/lib/gtp/support/gtp_tlv.py
index 734a06651..698d6ee40 100644
--- a/lib/gtp/support/gtp_tlv.py
+++ b/lib/gtp/support/gtp_tlv.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, CellWire Group
+# Copyright (c) 2017, NextEPC Group
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,7 @@ def write_file(f, string):
 def output_header_to_file(f):
     now = datetime.datetime.now()
     f.write("""/*
- * Copyright (c) 2017, CellWire Group
+ * Copyright (c) 2017, NextEPC Group
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/nas/nas_decoder.c b/lib/nas/nas_decoder.c
index 7f9439b74..9149f555c 100644
--- a/lib/nas/nas_decoder.c
+++ b/lib/nas/nas_decoder.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, CellWire Group
+ * Copyright (c) 2017, NextEPC Group
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/nas/nas_encoder.c b/lib/nas/nas_encoder.c
index 03ce5128b..085c2bb42 100644
--- a/lib/nas/nas_encoder.c
+++ b/lib/nas/nas_encoder.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, CellWire Group
+ * Copyright (c) 2017, NextEPC Group
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/nas/nas_ies.c b/lib/nas/nas_ies.c
index 3a84cff6b..3a0609cff 100644
--- a/lib/nas/nas_ies.c
+++ b/lib/nas/nas_ies.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, CellWire Group
+ * Copyright (c) 2017, NextEPC Group
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/nas/nas_ies.h b/lib/nas/nas_ies.h
index 1b4076bf8..a427b5749 100644
--- a/lib/nas/nas_ies.h
+++ b/lib/nas/nas_ies.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, CellWire Group
+ * Copyright (c) 2017, NextEPC Group
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/nas/nas_message.h b/lib/nas/nas_message.h
index ae399cfcd..2de883416 100644
--- a/lib/nas/nas_message.h
+++ b/lib/nas/nas_message.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, CellWire Group
+ * Copyright (c) 2017, NextEPC Group
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/nas/support/README b/lib/nas/support/README
index f7f1ea871..84abe0197 100644
--- a/lib/nas/support/README
+++ b/lib/nas/support/README
@@ -1,10 +1,10 @@
 
 * Install python-pip
-user@host ~/Documents/git/cellwire/lib/gtp/support$ \
+user@host ~/Documents/git/nextepc/lib/gtp/support$ \
     sudo apt-get install python-pip
 
 * Install python-docx
-user@host ~/Documents/git/cellwire/lib/gtp/support$ \
+user@host ~/Documents/git/nextepc/lib/gtp/support$ \
     sudo pip install python-docx
 
 * Change the format of standard specification 
@@ -12,5 +12,5 @@ user@host ~/Documents/git/cellwire/lib/gtp/support$ \
   using Microsoft Office 2007+
 
 * Generate Message support files
-user@host ~/Documents/git/cellwire/lib/s1ap/support$ \
+user@host ~/Documents/git/nextepc/lib/s1ap/support$ \
     python nas_message.py -f 24301-d80.docx -o ..
diff --git a/lib/nas/support/nas_message.py b/lib/nas/support/nas_message.py
index 1f95fb0b7..aa62af68f 100644
--- a/lib/nas/support/nas_message.py
+++ b/lib/nas/support/nas_message.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, CellWire Group
+# Copyright (c) 2017, NextEPC Group
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,7 @@ def write_file(f, string):
 def output_header_to_file(f):
     now = datetime.datetime.now()
     f.write("""/*
- * Copyright (c) 2017, CellWire Group
+ * Copyright (c) 2017, NextEPC Group
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/s1ap/support/asn1prefix.py b/lib/s1ap/support/asn1prefix.py
index 17f00a4f3..8f0afddcf 100644
--- a/lib/s1ap/support/asn1prefix.py
+++ b/lib/s1ap/support/asn1prefix.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, CellWire Group
+# Copyright (c) 2017, NextEPC Group
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/main.c b/main.c
index 05a63673c..4884ab171 100644
--- a/main.c
+++ b/main.c
@@ -8,13 +8,13 @@
 #include "core_signal.h"
 
 /* Server */
-#include "cellwire.h"
+#include "nextepc.h"
 
 static char *compile_time = __DATE__ " " __TIME__;
 
 static void show_version()
 {
-    printf("CellWire daemon v%s - %s\n", PACKAGE_VERSION, compile_time);
+    printf("NextEPC daemon v%s - %s\n", PACKAGE_VERSION, compile_time);
 }
 
 static void show_help()
@@ -22,7 +22,7 @@ static void show_help()
     show_version();
 
     printf("\n"
-           "Usage: cellwired [arguments]\n"
+           "Usage: nextepcd [arguments]\n"
            "\n"
            "Arguments:\n"
            "   -v                   Show version\n"
@@ -146,19 +146,19 @@ int main(int argc, char *argv[])
 #endif
     }
 
-    if (cellwire_initialize(config_path, log_path) != CORE_OK)
+    if (nextepc_initialize(config_path, log_path) != CORE_OK)
     {
-        d_fatal("CellWire initialization failed. Aborted");
+        d_fatal("NextEPC initialization failed. Aborted");
         return EXIT_FAILURE;
     }
 
     show_version();
-    d_info("CellWire daemon start");
+    d_info("NextEPC daemon start");
     signal_thread(check_signal);
 
-    d_info("CellWire daemon terminating...");
+    d_info("NextEPC daemon terminating...");
 
-    cellwire_terminate();
+    nextepc_terminate();
 
     return EXIT_SUCCESS;
 }
diff --git a/src/Makefile.am b/src/Makefile.am
index bdafa2f71..43a12ed97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,22 +2,22 @@
 
 SUBDIRS = mme hss sgw pgw
 
-noinst_LTLIBRARIES = libcellwire.la
+noinst_LTLIBRARIES = libnextepc.la
 
-libcellwire_la_SOURCES = \
-	cellwire.h 
+libnextepc_la_SOURCES = \
+	nextepc.h 
 
-nodist_libcellwire_la_SOURCES = \
+nodist_libnextepc_la_SOURCES = \
     init.c 
 
-libcellwire_la_DEPENDENCIES = \
+libnextepc_la_DEPENDENCIES = \
     $(top_srcdir)/lib/logger/liblogger.la \
     $(top_srcdir)/src/mme/libmme.la \
     $(top_srcdir)/src/hss/libhss.la \
     $(top_srcdir)/src/sgw/libsgw.la \
     $(top_srcdir)/src/pgw/libpgw.la
 
-libcellwire_la_LIBADD = \
+libnextepc_la_LIBADD = \
     $(top_srcdir)/lib/logger/liblogger.la \
     $(top_srcdir)/src/mme/libmme.la \
     $(top_srcdir)/src/hss/libhss.la \
diff --git a/src/init.c b/src/init.c
index 6f8f6839f..0227ec7a9 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1,4 +1,4 @@
-#define TRACE_MODULE _cellwire_init
+#define TRACE_MODULE _nextepc_init
 
 #include "core_general.h"
 #include "core_debug.h"
@@ -9,7 +9,7 @@
 
 #include "logger.h"
 
-#include "cellwire.h"
+#include "nextepc.h"
 
 static pid_t hss_pid;
 static pid_t logger_pid;
@@ -18,7 +18,7 @@ static thread_id net_thread;
 static int check_signal(int signum);
 void *THREAD_FUNC net_main(thread_id id, void *data);
 
-status_t cellwire_initialize(char *config_path, char *log_path)
+status_t nextepc_initialize(char *config_path, char *log_path)
 {
     status_t rv;
     semaphore_id semaphore;
@@ -75,7 +75,7 @@ status_t cellwire_initialize(char *config_path, char *log_path)
     return CORE_OK;
 }
 
-void cellwire_terminate(void)
+void nextepc_terminate(void)
 {
     thread_delete(net_thread);
     mme_terminate();
diff --git a/src/cellwire.h b/src/nextepc.h
similarity index 71%
rename from src/cellwire.h
rename to src/nextepc.h
index 4731d0fd2..356c01563 100644
--- a/src/cellwire.h
+++ b/src/nextepc.h
@@ -1,5 +1,5 @@
-#ifndef __CELLWIRE_H__
-#define __CELLWIRE_H__
+#ifndef __NEXTEPC_H__
+#define __NEXTEPC_H__
 
 #include "core.h"
 #include "core_errno.h"
@@ -8,8 +8,8 @@
 extern "C" {
 #endif /* __cplusplus */
 
-CORE_DECLARE(status_t) cellwire_initialize(char *config_path, char *log_path);
-CORE_DECLARE_NONSTD(void) cellwire_terminate(void);
+CORE_DECLARE(status_t) nextepc_initialize(char *config_path, char *log_path);
+CORE_DECLARE_NONSTD(void) nextepc_terminate(void);
 
 CORE_DECLARE(status_t) mme_initialize();
 CORE_DECLARE_NONSTD(void) mme_terminate(void);
@@ -27,4 +27,4 @@ CORE_DECLARE_NONSTD(void) pgw_terminate(void);
 }
 #endif /* __cplusplus */
 
-#endif /* !__CELLWIRE_H__ */
+#endif /* !__NEXTEPC_H__ */
diff --git a/test/Makefile.am b/test/Makefile.am
index 9739d9ecb..44ce416f1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in.
 
-bin_PROGRAMS = testcellwire
+bin_PROGRAMS = testnextepc
 
-testcellwire_SOURCES = \
+testnextepc_SOURCES = \
 	abts.h abts_tests.h testutil.h \
 	abts.c testutil.c tests1ap.h tests1ap.c \
 	3gpp_test.c \
@@ -10,8 +10,8 @@ testcellwire_SOURCES = \
 	security_test.c \
 	s1ap_sm_test.c nas_sm_test.c
 
-testcellwire_LDADD = \
-    $(top_srcdir)/src/libcellwire.la
+testnextepc_LDADD = \
+    $(top_srcdir)/src/libnextepc.la
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \
@@ -30,7 +30,7 @@ AM_CFLAGS = \
 	-Wall -Werror \
 	-Wno-unused-function -Wno-unused-variable
 
-TESTS = testcellwire
+TESTS = testnextepc
 
 MAINTAINERCLEANFILES = Makefile.in 
 MOSTLYCLEANFILES = core *.stackdump
diff --git a/test/testutil.c b/test/testutil.c
index 4974c1139..26b399c6b 100644
--- a/test/testutil.c
+++ b/test/testutil.c
@@ -16,7 +16,7 @@
 
 #include "core_debug.h"
 
-#include "cellwire.h"
+#include "nextepc.h"
 #include "mme_context.h"
 #include "abts.h"
 #include "testutil.h"
@@ -38,12 +38,12 @@ void core_assert_ok(abts_case* tc, const char* context, status_t rv,
 
 void test_terminate(void)
 {
-    cellwire_terminate();
+    nextepc_terminate();
 }
 
 void test_initialize(void)
 {
-    cellwire_initialize(NULL, NULL);
+    nextepc_initialize(NULL, NULL);
 
 #if 0
     inet_pton(AF_INET, "10.1.35.215", &mme_self()->s1ap_addr);