rename accel-pptp to accel-ppp

152 files changed, 54 insertions, 54 deletions

diff --git a/accel-pptpd/CMakeLists.txt b/accel-pppd/CMakeLists.txt
index e0a8dd48..f65e2e62 100644
--- a/accel-pptpd/CMakeLists.txt
+++ b/accel-pppd/CMakeLists.txt
@@ -20,14 +20,14 @@ IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git)
 		COMMAND head -n1
 		COMMAND awk "{print $2}"
 		WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
-		OUTPUT_VARIABLE ACCEL_PPTP_VERSION
+		OUTPUT_VARIABLE ACCEL_PPP_VERSION
 	)
-	STRING(STRIP ${ACCEL_PPTP_VERSION} ACCEL_PPTP_VERSION)
+	STRING(STRIP ${ACCEL_PPP_VERSION} ACCEL_PPP_VERSION)
 ELSE (EXISTS ${CMAKE_HOME_DIRECTORY}/.git)
-	SET (ACCEL_PPTP_VERSION 1.3.2)
+	SET (ACCEL_PPP_VERSION 1.3.2)
 ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git)
 
-ADD_DEFINITIONS(-DACCEL_PPTP_VERSION="${ACCEL_PPTP_VERSION}")
+ADD_DEFINITIONS(-DACCEL_PPP_VERSION="${ACCEL_PPP_VERSION}")
 
 INCLUDE_DIRECTORIES(include)
 
@@ -50,7 +50,7 @@ ADD_SUBDIRECTORY(auth)
 ADD_SUBDIRECTORY(logs)
 ADD_SUBDIRECTORY(extra)
 
-ADD_EXECUTABLE(accel-pptpd
+ADD_EXECUTABLE(accel-pppd
 	ppp/ppp.c
 	ppp/ppp_fsm.c
 	ppp/ppp_lcp.c
@@ -83,20 +83,20 @@ ADD_EXECUTABLE(accel-pptpd
 	memdebug.c
 )
 
-TARGET_LINK_LIBRARIES(accel-pptpd triton rt pthread crypto pcre)
-set_property(TARGET accel-pptpd PROPERTY CMAKE_SKIP_BUILD_RPATH FALSE)
-set_property(TARGET accel-pptpd PROPERTY CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-set_property(TARGET accel-pptpd PROPERTY INSTALL_RPATH_USE_LINK_PATH FALSE)
-set_property(TARGET accel-pptpd PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib/accel-pptp)
+TARGET_LINK_LIBRARIES(accel-pppd triton rt pthread crypto pcre)
+set_property(TARGET accel-pppd PROPERTY CMAKE_SKIP_BUILD_RPATH FALSE)
+set_property(TARGET accel-pppd PROPERTY CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+set_property(TARGET accel-pppd PROPERTY INSTALL_RPATH_USE_LINK_PATH FALSE)
+set_property(TARGET accel-pppd PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib/accel-ppp)
 
-INSTALL(TARGETS accel-pptpd
+INSTALL(TARGETS accel-pppd
 	RUNTIME DESTINATION sbin
 )
 
-INSTALL(FILES accel-pptp.conf DESTINATION /etc RENAME accel-pptp.conf.dist)
-INSTALL(FILES accel-pptp.conf.5 DESTINATION share/man/man5)
+INSTALL(FILES accel-ppp.conf DESTINATION /etc RENAME accel-ppp.conf.dist)
+INSTALL(FILES accel-ppp.conf.5 DESTINATION share/man/man5)
 
-INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p /var/log/accel-pptp)")
-INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p /var/run/accel-pptp)")
-INSTALL(CODE "EXECUTE_PROCESS(COMMAND 'echo 0 > /var/run/accel-pptp/seq')")
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p /var/log/accel-ppp)")
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p /var/run/accel-ppp)")
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND 'echo 0 > /var/run/accel-ppp/seq')")
 
diff --git a/accel-pptpd/accel-pptp.conf b/accel-pppd/accel-ppp.conf
index 0050ceab..ab844dd3 100644
--- a/accel-pptpd/accel-pptp.conf
+++ b/accel-pppd/accel-ppp.conf
@@ -1,5 +1,5 @@
 [modules]
-#path=/usr/local/lib/accel-pptp
+#path=/usr/local/lib/accel-ppp
 log_file
 #log_tcp
 #log_pgsql
@@ -18,7 +18,7 @@ pppd_compat
 #chap-secrets
 
 [core]
-log-error=/var/log/accel-pptp/core.log
+log-error=/var/log/accel-ppp/core.log
 thread-count=4
 
 [ppp]
@@ -48,12 +48,12 @@ interface=eth0
 verbose=1
 
 [l2tp]
-#dictionary=/usr/local/share/accel-pptp/l2tp/dictionary
+#dictionary=/usr/local/share/accel-ppp/l2tp/dictionary
 #hello-interval=60
 #timeout=60
 #rtimeout=5
 #retransmit=5
-#host-name=accel-pptp
+#host-name=accel-ppp
 verbose=1
 
 [dns]
@@ -61,8 +61,8 @@ verbose=1
 #dns2=172.16.1.1
 
 [radius]
-#dictionary=/usr/local/share/accel-pptp/radius/dictionary
-nas-identifier=accel-pptp
+#dictionary=/usr/local/share/accel-ppp/radius/dictionary
+nas-identifier=accel-ppp
 nas-ip-address=127.0.0.1
 gw-ip-address=192.168.100.1
 auth-server=127.0.0.1:1812,testing123
@@ -85,8 +85,8 @@ gw-ip-address=192.168.0.1
 192.168.3.1-255
 
 [log]
-log-file=/var/log/accel-pptp/accel-pptp.log
-log-emerg=/var/log/accel-pptp/emerg.log
+log-file=/var/log/accel-ppp/accel-ppp.log
+log-emerg=/var/log/accel-ppp/emerg.log
 #log-debug=/dev/stdout
 #log-tcp=127.0.0.1:3000
 copy=1
diff --git a/accel-pptpd/accel-pptp.conf.5 b/accel-pppd/accel-ppp.conf.5
index b786bef2..d9aaadb3 100644
--- a/accel-pptpd/accel-pptp.conf.5
+++ b/accel-pppd/accel-ppp.conf.5
@@ -1,11 +1,11 @@
-.TH ACCEL-PPTP.CONF 5 "6 October 2010"
+.TH ACCEL-PPP.CONF 5 "6 October 2010"
 .SH NAME
-.B accel-pptp.conf
-- ACCEL-PPTP VPN daemon configuration
+.B accel-ppp.conf
+- ACCEL-PPP VPN daemon configuration
 .SH DESCRIPTION
-.BR accel-pptpd (8)
+.BR accel-pppd (8)
 reads options from this file, usually
-.IR /etc/accel-pptp.conf
+.IR /etc/accel-ppp.conf
 .TP
 Configuration file consists of sections in form:
 .TP
@@ -102,7 +102,7 @@ Disable CCP negotiation if this parameter is zero.
 Specifies in which case generate session identifier (default lower).
 .TP
 .BI "check-ip=" 0|1
-Specifies whether accel-pptp should check if IP already assigned to other ppp interface (default 0).
+Specifies whether accel-ppp should check if IP already assigned to other ppp interface (default 0).
 .TP
 .SH [lcp]
 .br
diff --git a/accel-pptpd/auth/CMakeLists.txt b/accel-pppd/auth/CMakeLists.txt
index dbf4d13b..ef9478aa 100644
--- a/accel-pptpd/auth/CMakeLists.txt
+++ b/accel-pppd/auth/CMakeLists.txt
@@ -8,6 +8,6 @@ TARGET_LINK_LIBRARIES(auth_mschap_v1 crypto)
 TARGET_LINK_LIBRARIES(auth_mschap_v2 crypto)
 
 INSTALL(TARGETS auth_pap auth_chap_md5 auth_mschap_v1 auth_mschap_v2
-	LIBRARY DESTINATION lib/accel-pptp
+	LIBRARY DESTINATION lib/accel-ppp
 )
 
diff --git a/accel-pptpd/auth/auth_chap_md5.c b/accel-pppd/auth/auth_chap_md5.c
index d19634a5..d19634a5 100644
--- a/accel-pptpd/auth/auth_chap_md5.c
+++ b/accel-pppd/auth/auth_chap_md5.c
diff --git a/accel-pptpd/auth/auth_mschap_v1.c b/accel-pppd/auth/auth_mschap_v1.c
index 5b38db54..5b38db54 100644
--- a/accel-pptpd/auth/auth_mschap_v1.c
+++ b/accel-pppd/auth/auth_mschap_v1.c
diff --git a/accel-pptpd/auth/auth_mschap_v2.c b/accel-pppd/auth/auth_mschap_v2.c
index e07c4f7e..e07c4f7e 100644
--- a/accel-pptpd/auth/auth_mschap_v2.c
+++ b/accel-pppd/auth/auth_mschap_v2.c
diff --git a/accel-pptpd/auth/auth_pap.c b/accel-pppd/auth/auth_pap.c
index 69090464..69090464 100644
--- a/accel-pptpd/auth/auth_pap.c
+++ b/accel-pppd/auth/auth_pap.c
diff --git a/accel-pptpd/cli/CMakeLists.txt b/accel-pppd/cli/CMakeLists.txt
index 8b137891..8b137891 100644
--- a/accel-pptpd/cli/CMakeLists.txt
+++ b/accel-pppd/cli/CMakeLists.txt
diff --git a/accel-pptpd/cli/cli.c b/accel-pppd/cli/cli.c
index ef168ded..5009a742 100644
--- a/accel-pptpd/cli/cli.c
+++ b/accel-pppd/cli/cli.c
@@ -18,7 +18,7 @@
 #define MSG_UNKNOWN_CMD "command unknown\r\n"
 
 char *conf_cli_passwd;
-static const char *def_cli_prompt = "accel-pptp";
+static const char *def_cli_prompt = "accel-ppp";
 char *conf_cli_prompt;
 
 static LIST_HEAD(simple_cmd_list);
diff --git a/accel-pptpd/cli/cli.h b/accel-pppd/cli/cli.h
index cdceb2fa..cdceb2fa 100644
--- a/accel-pptpd/cli/cli.h
+++ b/accel-pppd/cli/cli.h
diff --git a/accel-pptpd/cli/cli_p.h b/accel-pppd/cli/cli_p.h
index 0fcba309..0fcba309 100644
--- a/accel-pptpd/cli/cli_p.h
+++ b/accel-pppd/cli/cli_p.h
diff --git a/accel-pptpd/cli/show_sessions.c b/accel-pppd/cli/show_sessions.c
index 90aeb3fc..90aeb3fc 100644
--- a/accel-pptpd/cli/show_sessions.c
+++ b/accel-pppd/cli/show_sessions.c
diff --git a/accel-pptpd/cli/std_cmd.c b/accel-pppd/cli/std_cmd.c
index a49bbce6..a49bbce6 100644
--- a/accel-pptpd/cli/std_cmd.c
+++ b/accel-pppd/cli/std_cmd.c
diff --git a/accel-pptpd/cli/tcp.c b/accel-pppd/cli/tcp.c
index 260225f1..260225f1 100644
--- a/accel-pptpd/cli/tcp.c
+++ b/accel-pppd/cli/tcp.c
diff --git a/accel-pptpd/cli/telnet.c b/accel-pppd/cli/telnet.c
index 0ea19fb1..5176df29 100644
--- a/accel-pptpd/cli/telnet.c
+++ b/accel-pppd/cli/telnet.c
@@ -69,7 +69,7 @@ static uint8_t *recv_buf;
 static uint8_t *temp_buf;
 
 static int conf_history_len = 100;
-static const char *conf_history_file = "/var/run/accel-pptp/history";
+static const char *conf_history_file = "/var/run/accel-ppp/history";
 static LIST_HEAD(history);
 static int history_len;
 static pthread_mutex_t history_lock = PTHREAD_MUTEX_INITIALIZER;
@@ -191,7 +191,7 @@ static int cli_client_sendv(struct cli_client_t *tcln, const char *fmt, va_list
 
 static int send_banner(struct telnet_client_t *cln)
 {
-	if (telnet_send(cln, "accel-pptp version " ACCEL_PPTP_VERSION "\r\n", sizeof("accel-pptp version " ACCEL_PPTP_VERSION "\r\n")))
+	if (telnet_send(cln, "accel-ppp version " ACCEL_PPP_VERSION "\r\n", sizeof("accel-ppp version " ACCEL_PPP_VERSION "\r\n")))
 		return -1;
 	return 0;
 }
diff --git a/accel-pptpd/ctrl/CMakeLists.txt b/accel-pppd/ctrl/CMakeLists.txt
index 6b37bc4a..6b37bc4a 100644
--- a/accel-pptpd/ctrl/CMakeLists.txt
+++ b/accel-pppd/ctrl/CMakeLists.txt
diff --git a/accel-pptpd/ctrl/l2tp/CMakeLists.txt b/accel-pppd/ctrl/l2tp/CMakeLists.txt
index e0edd517..b2952899 100644
--- a/accel-pptpd/ctrl/l2tp/CMakeLists.txt
+++ b/accel-pppd/ctrl/l2tp/CMakeLists.txt
@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_DEFINITIONS(-DDICTIONARY="${CMAKE_INSTALL_PREFIX}/share/accel-pptp/l2tp/dictionary")
+ADD_DEFINITIONS(-DDICTIONARY="${CMAKE_INSTALL_PREFIX}/share/accel-ppp/l2tp/dictionary")
 
 ADD_LIBRARY(l2tp SHARED
 	l2tp.c
@@ -10,8 +10,8 @@ ADD_LIBRARY(l2tp SHARED
 )
 #TARGET_LINK_LIBRARIES(l2tp nl nl-genl)
 
-INSTALL(TARGETS l2tp LIBRARY DESTINATION lib/accel-pptp)
+INSTALL(TARGETS l2tp LIBRARY DESTINATION lib/accel-ppp)
 
 FILE(GLOB dict "${CMAKE_CURRENT_SOURCE_DIR}/dict/*")
-INSTALL(FILES ${dict} DESTINATION share/accel-pptp/l2tp)
+INSTALL(FILES ${dict} DESTINATION share/accel-ppp/l2tp)
 
diff --git a/accel-pptpd/ctrl/l2tp/attr_defs.h b/accel-pppd/ctrl/l2tp/attr_defs.h
index e7991574..e7991574 100644
--- a/accel-pptpd/ctrl/l2tp/attr_defs.h
+++ b/accel-pppd/ctrl/l2tp/attr_defs.h
diff --git a/accel-pptpd/ctrl/l2tp/dict.c b/accel-pppd/ctrl/l2tp/dict.c
index c93ccd48..c93ccd48 100644
--- a/accel-pptpd/ctrl/l2tp/dict.c
+++ b/accel-pppd/ctrl/l2tp/dict.c
diff --git a/accel-pptpd/ctrl/l2tp/dict/dictionary b/accel-pppd/ctrl/l2tp/dict/dictionary
index f5d7c423..f5d7c423 100644
--- a/accel-pptpd/ctrl/l2tp/dict/dictionary
+++ b/accel-pppd/ctrl/l2tp/dict/dictionary
diff --git a/accel-pptpd/ctrl/l2tp/dict/dictionary.rfc2661 b/accel-pppd/ctrl/l2tp/dict/dictionary.rfc2661
index 3fd9614e..3fd9614e 100644
--- a/accel-pptpd/ctrl/l2tp/dict/dictionary.rfc2661
+++ b/accel-pppd/ctrl/l2tp/dict/dictionary.rfc2661
diff --git a/accel-pptpd/ctrl/l2tp/dict/dictionary.rfc3931 b/accel-pppd/ctrl/l2tp/dict/dictionary.rfc3931
index d6ad410b..d6ad410b 100644
--- a/accel-pptpd/ctrl/l2tp/dict/dictionary.rfc3931
+++ b/accel-pppd/ctrl/l2tp/dict/dictionary.rfc3931
diff --git a/accel-pptpd/ctrl/l2tp/dict2c.py b/accel-pppd/ctrl/l2tp/dict2c.py
index ff0961e7..ff0961e7 100644
--- a/accel-pptpd/ctrl/l2tp/dict2c.py
+++ b/accel-pppd/ctrl/l2tp/dict2c.py
diff --git a/accel-pptpd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c
index ca56051b..ca56051b 100644
--- a/accel-pptpd/ctrl/l2tp/l2tp.c
+++ b/accel-pppd/ctrl/l2tp/l2tp.c
diff --git a/accel-pptpd/ctrl/l2tp/l2tp.h b/accel-pppd/ctrl/l2tp/l2tp.h
index ac9b8e0b..ac9b8e0b 100644
--- a/accel-pptpd/ctrl/l2tp/l2tp.h
+++ b/accel-pppd/ctrl/l2tp/l2tp.h
diff --git a/accel-pptpd/ctrl/l2tp/l2tp_kernel.h b/accel-pppd/ctrl/l2tp/l2tp_kernel.h
index 4bdb31df..4bdb31df 100644
--- a/accel-pptpd/ctrl/l2tp/l2tp_kernel.h
+++ b/accel-pppd/ctrl/l2tp/l2tp_kernel.h
diff --git a/accel-pptpd/ctrl/l2tp/l2tp_prot.h b/accel-pppd/ctrl/l2tp/l2tp_prot.h
index 1c1d9dae..1c1d9dae 100644
--- a/accel-pptpd/ctrl/l2tp/l2tp_prot.h
+++ b/accel-pppd/ctrl/l2tp/l2tp_prot.h
diff --git a/accel-pptpd/ctrl/l2tp/netlink.c b/accel-pppd/ctrl/l2tp/netlink.c
index 7c8c79a6..7c8c79a6 100644
--- a/accel-pptpd/ctrl/l2tp/netlink.c
+++ b/accel-pppd/ctrl/l2tp/netlink.c
diff --git a/accel-pptpd/ctrl/l2tp/packet.c b/accel-pppd/ctrl/l2tp/packet.c
index e3f68965..e3f68965 100644
--- a/accel-pptpd/ctrl/l2tp/packet.c
+++ b/accel-pppd/ctrl/l2tp/packet.c
diff --git a/accel-pptpd/ctrl/pppoe/CMakeLists.txt b/accel-pppd/ctrl/pppoe/CMakeLists.txt
index f047936e..b2c0584d 100644
--- a/accel-pptpd/ctrl/pppoe/CMakeLists.txt
+++ b/accel-pppd/ctrl/pppoe/CMakeLists.txt
@@ -14,4 +14,4 @@ ENDIF(RADIUS)
 ADD_LIBRARY(pppoe SHARED ${sources})
 TARGET_LINK_LIBRARIES(pppoe crypto)
 
-INSTALL(TARGETS pppoe LIBRARY DESTINATION lib/accel-pptp)
+INSTALL(TARGETS pppoe LIBRARY DESTINATION lib/accel-ppp)
diff --git a/accel-pptpd/ctrl/pppoe/cli.c b/accel-pppd/ctrl/pppoe/cli.c
index 9929f669..9929f669 100644
--- a/accel-pptpd/ctrl/pppoe/cli.c
+++ b/accel-pppd/ctrl/pppoe/cli.c
diff --git a/accel-pptpd/ctrl/pppoe/dpado.c b/accel-pppd/ctrl/pppoe/dpado.c
index 3f565198..3f565198 100644
--- a/accel-pptpd/ctrl/pppoe/dpado.c
+++ b/accel-pppd/ctrl/pppoe/dpado.c
diff --git a/accel-pptpd/ctrl/pppoe/mac_filter.c b/accel-pppd/ctrl/pppoe/mac_filter.c
index 9b101c67..9b101c67 100644
--- a/accel-pptpd/ctrl/pppoe/mac_filter.c
+++ b/accel-pppd/ctrl/pppoe/mac_filter.c
diff --git a/accel-pptpd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c
index 95ae3944..7860c4ed 100644
--- a/accel-pptpd/ctrl/pppoe/pppoe.c
+++ b/accel-pppd/ctrl/pppoe/pppoe.c
@@ -1283,6 +1283,6 @@ static void __init pppoe_init(void)
 	}
 
 	if (!conf_ac_name)
-		conf_ac_name = _strdup("accel-pptp");
+		conf_ac_name = _strdup("accel-ppp");
 }
 
diff --git a/accel-pptpd/ctrl/pppoe/pppoe.h b/accel-pppd/ctrl/pppoe/pppoe.h
index 2264dd16..2264dd16 100644
--- a/accel-pptpd/ctrl/pppoe/pppoe.h
+++ b/accel-pppd/ctrl/pppoe/pppoe.h
diff --git a/accel-pptpd/ctrl/pppoe/tr101.c b/accel-pppd/ctrl/pppoe/tr101.c
index cfb0fbcf..cfb0fbcf 100644
--- a/accel-pptpd/ctrl/pppoe/tr101.c
+++ b/accel-pppd/ctrl/pppoe/tr101.c
diff --git a/accel-pptpd/ctrl/pptp/CMakeLists.txt b/accel-pppd/ctrl/pptp/CMakeLists.txt
index e9c27791..3199e7f1 100644
--- a/accel-pptpd/ctrl/pptp/CMakeLists.txt
+++ b/accel-pppd/ctrl/pptp/CMakeLists.txt
@@ -2,4 +2,4 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 ADD_LIBRARY(pptp SHARED pptp.c)
 
-INSTALL(TARGETS pptp LIBRARY DESTINATION lib/accel-pptp )
+INSTALL(TARGETS pptp LIBRARY DESTINATION lib/accel-ppp )
diff --git a/accel-pptpd/ctrl/pptp/pptp.c b/accel-pppd/ctrl/pptp/pptp.c
index 687aecbc..687aecbc 100644
--- a/accel-pptpd/ctrl/pptp/pptp.c
+++ b/accel-pppd/ctrl/pptp/pptp.c
diff --git a/accel-pptpd/ctrl/pptp/pptp_prot.h b/accel-pppd/ctrl/pptp/pptp_prot.h
index ee8cb341..ee8cb341 100644
--- a/accel-pptpd/ctrl/pptp/pptp_prot.h
+++ b/accel-pppd/ctrl/pptp/pptp_prot.h
diff --git a/accel-pptpd/extra/CMakeLists.txt b/accel-pppd/extra/CMakeLists.txt
index 5578e930..03d857ab 100644
--- a/accel-pptpd/extra/CMakeLists.txt
+++ b/accel-pppd/extra/CMakeLists.txt
@@ -4,7 +4,7 @@ ADD_LIBRARY(sigchld SHARED sigchld.c)
 ADD_LIBRARY(chap-secrets SHARED chap-secrets.c)
 
 INSTALL(TARGETS pppd_compat ippool sigchld chap-secrets
-	LIBRARY DESTINATION lib/accel-pptp
+	LIBRARY DESTINATION lib/accel-ppp
 )
 
 IF (SHAPER)
@@ -14,6 +14,6 @@ IF (SHAPER)
 		SET_PROPERTY(TARGET shaper_tbf PROPERTY LINK_FLAGS "-L${LIBNL_PREFIX}/lib")
 	ENDIF (LIBNL_PREFIX)
 	TARGET_LINK_LIBRARIES(shaper_tbf nl m)
-	INSTALL(TARGETS shaper_tbf LIBRARY DESTINATION lib/accel-pptp)
+	INSTALL(TARGETS shaper_tbf LIBRARY DESTINATION lib/accel-ppp)
 ENDIF (SHAPER)
 
diff --git a/accel-pptpd/extra/chap-secrets.c b/accel-pppd/extra/chap-secrets.c
index 35503473..35503473 100644
--- a/accel-pptpd/extra/chap-secrets.c
+++ b/accel-pppd/extra/chap-secrets.c
diff --git a/accel-pptpd/extra/ippool.c b/accel-pppd/extra/ippool.c
index 6136a14d..6136a14d 100644
--- a/accel-pptpd/extra/ippool.c
+++ b/accel-pppd/extra/ippool.c
diff --git a/accel-pptpd/extra/pppd_compat.c b/accel-pppd/extra/pppd_compat.c
index f897dd68..f897dd68 100644
--- a/accel-pptpd/extra/pppd_compat.c
+++ b/accel-pppd/extra/pppd_compat.c
diff --git a/accel-pptpd/extra/shaper_tbf.c b/accel-pppd/extra/shaper_tbf.c
index d7e4f0bd..d7e4f0bd 100644
--- a/accel-pptpd/extra/shaper_tbf.c
+++ b/accel-pppd/extra/shaper_tbf.c
diff --git a/accel-pptpd/extra/sigchld.c b/accel-pppd/extra/sigchld.c
index abfd42f1..abfd42f1 100644
--- a/accel-pptpd/extra/sigchld.c
+++ b/accel-pppd/extra/sigchld.c
diff --git a/accel-pptpd/extra/sigchld.h b/accel-pppd/extra/sigchld.h
index 27d1adf4..27d1adf4 100644
--- a/accel-pptpd/extra/sigchld.h
+++ b/accel-pppd/extra/sigchld.h
diff --git a/accel-pptpd/include/cli.h b/accel-pppd/include/cli.h
index b0f49023..b0f49023 120000
--- a/accel-pptpd/include/cli.h
+++ b/accel-pppd/include/cli.h
diff --git a/accel-pptpd/include/events.h b/accel-pppd/include/events.h
index 6a8caf05..6a8caf05 100644
--- a/accel-pptpd/include/events.h
+++ b/accel-pppd/include/events.h
diff --git a/accel-pptpd/include/if_pppox.h b/accel-pppd/include/if_pppox.h
index 0532d18f..0532d18f 100644
--- a/accel-pptpd/include/if_pppox.h
+++ b/accel-pppd/include/if_pppox.h
diff --git a/accel-pptpd/include/ipdb.h b/accel-pppd/include/ipdb.h
index 77ab85b8..77ab85b8 120000
--- a/accel-pptpd/include/ipdb.h
+++ b/accel-pppd/include/ipdb.h
diff --git a/accel-pptpd/include/iprange.h b/accel-pppd/include/iprange.h
index b8c2c43d..b8c2c43d 120000
--- a/accel-pptpd/include/iprange.h
+++ b/accel-pppd/include/iprange.h
diff --git a/accel-pptpd/include/linux_ppp.h b/accel-pppd/include/linux_ppp.h
index ebb4c235..ebb4c235 100644
--- a/accel-pptpd/include/linux_ppp.h
+++ b/accel-pppd/include/linux_ppp.h
diff --git a/accel-pptpd/include/list.h b/accel-pppd/include/list.h
index 4b6d9a91..4b6d9a91 120000
--- a/accel-pptpd/include/list.h
+++ b/accel-pppd/include/list.h
diff --git a/accel-pptpd/include/log.h b/accel-pppd/include/log.h
index 49a04dd9..49a04dd9 120000
--- a/accel-pptpd/include/log.h
+++ b/accel-pppd/include/log.h
diff --git a/accel-pptpd/include/memdebug.h b/accel-pppd/include/memdebug.h
index 3ee61bc2..3ee61bc2 120000
--- a/accel-pptpd/include/memdebug.h
+++ b/accel-pppd/include/memdebug.h
diff --git a/accel-pptpd/include/mempool.h b/accel-pppd/include/mempool.h
index 2637ab65..2637ab65 120000
--- a/accel-pptpd/include/mempool.h
+++ b/accel-pppd/include/mempool.h
diff --git a/accel-pptpd/include/ppp.h b/accel-pppd/include/ppp.h
index ae3fa2ef..ae3fa2ef 120000
--- a/accel-pptpd/include/ppp.h
+++ b/accel-pppd/include/ppp.h
diff --git a/accel-pptpd/include/ppp_auth.h b/accel-pppd/include/ppp_auth.h
index 527c8538..527c8538 120000
--- a/accel-pptpd/include/ppp_auth.h
+++ b/accel-pppd/include/ppp_auth.h
diff --git a/accel-pptpd/include/ppp_fsm.h b/accel-pppd/include/ppp_fsm.h
index 5c6b7f47..5c6b7f47 120000
--- a/accel-pptpd/include/ppp_fsm.h
+++ b/accel-pppd/include/ppp_fsm.h
diff --git a/accel-pptpd/include/ppp_lcp.h b/accel-pppd/include/ppp_lcp.h
index 49027522..49027522 120000
--- a/accel-pptpd/include/ppp_lcp.h
+++ b/accel-pppd/include/ppp_lcp.h
diff --git a/accel-pptpd/include/pwdb.h b/accel-pppd/include/pwdb.h
index 360efe4d..360efe4d 120000
--- a/accel-pptpd/include/pwdb.h
+++ b/accel-pppd/include/pwdb.h
diff --git a/accel-pptpd/include/radius.h b/accel-pppd/include/radius.h
index e1465f19..e1465f19 120000
--- a/accel-pptpd/include/radius.h
+++ b/accel-pppd/include/radius.h
diff --git a/accel-pptpd/include/sigchld.h b/accel-pppd/include/sigchld.h
index 9b74ebdb..9b74ebdb 120000
--- a/accel-pptpd/include/sigchld.h
+++ b/accel-pppd/include/sigchld.h
diff --git a/accel-pptpd/include/spinlock.h b/accel-pppd/include/spinlock.h
index 09edcf6b..09edcf6b 120000
--- a/accel-pptpd/include/spinlock.h
+++ b/accel-pppd/include/spinlock.h
diff --git a/accel-pptpd/include/triton.h b/accel-pppd/include/triton.h
index 6f35a2fe..6f35a2fe 120000
--- a/accel-pptpd/include/triton.h
+++ b/accel-pppd/include/triton.h
diff --git a/accel-pptpd/include/utils.h b/accel-pppd/include/utils.h
index 6cd5d4fd..6cd5d4fd 120000
--- a/accel-pptpd/include/utils.h
+++ b/accel-pppd/include/utils.h
diff --git a/accel-pptpd/ipdb.c b/accel-pppd/ipdb.c
index a08d3be2..a08d3be2 100644
--- a/accel-pptpd/ipdb.c
+++ b/accel-pppd/ipdb.c
diff --git a/accel-pptpd/ipdb.h b/accel-pppd/ipdb.h
index ebf38853..ebf38853 100644
--- a/accel-pptpd/ipdb.h
+++ b/accel-pppd/ipdb.h
diff --git a/accel-pptpd/iprange.c b/accel-pppd/iprange.c
index 411dcb76..411dcb76 100644
--- a/accel-pptpd/iprange.c
+++ b/accel-pppd/iprange.c
diff --git a/accel-pptpd/iprange.h b/accel-pppd/iprange.h
index 88a2486a..88a2486a 100644
--- a/accel-pptpd/iprange.h
+++ b/accel-pppd/iprange.h
diff --git a/accel-pptpd/log.c b/accel-pppd/log.c
index 428feddf..428feddf 100644
--- a/accel-pptpd/log.c
+++ b/accel-pppd/log.c
diff --git a/accel-pptpd/log.h b/accel-pppd/log.h
index d87c42c0..d87c42c0 100644
--- a/accel-pptpd/log.h
+++ b/accel-pppd/log.h
diff --git a/accel-pptpd/logs/CMakeLists.txt b/accel-pppd/logs/CMakeLists.txt
index 0665e9a5..ce909b67 100644
--- a/accel-pptpd/logs/CMakeLists.txt
+++ b/accel-pppd/logs/CMakeLists.txt
@@ -4,14 +4,14 @@ TARGET_LINK_LIBRARIES(log_file rt)
 ADD_LIBRARY(log_tcp SHARED log_tcp.c)
 
 INSTALL(TARGETS log_file log_tcp
-	LIBRARY DESTINATION lib/accel-pptp
+	LIBRARY DESTINATION lib/accel-ppp
 )
 
 IF(LOG_PGSQL)
 	ADD_LIBRARY(log_pgsql SHARED log_pgsql.c)
 	TARGET_LINK_LIBRARIES(log_pgsql pq)
 	INSTALL(TARGETS log_pgsql
-		LIBRARY DESTINATION lib/accel-pptp
+		LIBRARY DESTINATION lib/accel-ppp
 	)
 ENDIF(LOG_PGSQL)
 
diff --git a/accel-pptpd/logs/log_file.c b/accel-pppd/logs/log_file.c
index e4357573..e4357573 100644
--- a/accel-pptpd/logs/log_file.c
+++ b/accel-pppd/logs/log_file.c
diff --git a/accel-pptpd/logs/log_pgsql.c b/accel-pppd/logs/log_pgsql.c
index af67e0b0..af67e0b0 100644
--- a/accel-pptpd/logs/log_pgsql.c
+++ b/accel-pppd/logs/log_pgsql.c
diff --git a/accel-pptpd/logs/log_tcp.c b/accel-pppd/logs/log_tcp.c
index 306c450f..306c450f 100644
--- a/accel-pptpd/logs/log_tcp.c
+++ b/accel-pppd/logs/log_tcp.c
diff --git a/accel-pptpd/main.c b/accel-pppd/main.c
index 5a026856..2e48c450 100644
--- a/accel-pptpd/main.c
+++ b/accel-pppd/main.c
@@ -77,7 +77,7 @@ static void __init __main(void)
 	return;
 
 usage:
-	printf("usage: pptpd [-d] [-p <file>] -c <file>\n\
+	printf("usage: accel-pppd [-d] [-p <file>] -c <file>\n\
 	where:\n\
 		-d - daemon mode\n\
 		-p - write pid to <file>\n\
@@ -156,7 +156,7 @@ int main(int argc, char **argv)
 	if (triton_load_modules("modules"))
 		return EXIT_FAILURE;
 
-	log_msg("accel-pptp version %s\n", ACCEL_PPTP_VERSION);
+	log_msg("accel-ppp version %s\n", ACCEL_PPP_VERSION);
 
 	triton_run();
 
diff --git a/accel-pptpd/memdebug.c b/accel-pppd/memdebug.c
index c33e34bc..c33e34bc 100644
--- a/accel-pptpd/memdebug.c
+++ b/accel-pppd/memdebug.c
diff --git a/accel-pptpd/memdebug.h b/accel-pppd/memdebug.h
index dc6b9ad1..dc6b9ad1 100644
--- a/accel-pptpd/memdebug.h
+++ b/accel-pppd/memdebug.h
diff --git a/accel-pptpd/ppp/CMakeLists.txt b/accel-pppd/ppp/CMakeLists.txt
index f4c0f04a..f4c0f04a 100644
--- a/accel-pptpd/ppp/CMakeLists.txt
+++ b/accel-pppd/ppp/CMakeLists.txt
diff --git a/accel-pptpd/ppp/ccp_mppe.c b/accel-pppd/ppp/ccp_mppe.c
index 0952aa01..0952aa01 100644
--- a/accel-pptpd/ppp/ccp_mppe.c
+++ b/accel-pppd/ppp/ccp_mppe.c
diff --git a/accel-pptpd/ppp/ipcp_opt_dns.c b/accel-pppd/ppp/ipcp_opt_dns.c
index c1770922..c1770922 100644
--- a/accel-pptpd/ppp/ipcp_opt_dns.c
+++ b/accel-pppd/ppp/ipcp_opt_dns.c
diff --git a/accel-pptpd/ppp/ipcp_opt_ipaddr.c b/accel-pppd/ppp/ipcp_opt_ipaddr.c
index 334f4256..334f4256 100644
--- a/accel-pptpd/ppp/ipcp_opt_ipaddr.c
+++ b/accel-pppd/ppp/ipcp_opt_ipaddr.c
diff --git a/accel-pptpd/ppp/lcp_opt_accomp.c b/accel-pppd/ppp/lcp_opt_accomp.c
index 241b0e06..241b0e06 100644
--- a/accel-pptpd/ppp/lcp_opt_accomp.c
+++ b/accel-pppd/ppp/lcp_opt_accomp.c
diff --git a/accel-pptpd/ppp/lcp_opt_magic.c b/accel-pppd/ppp/lcp_opt_magic.c
index 4a61ef91..4a61ef91 100644
--- a/accel-pptpd/ppp/lcp_opt_magic.c
+++ b/accel-pppd/ppp/lcp_opt_magic.c
diff --git a/accel-pptpd/ppp/lcp_opt_mru.c b/accel-pppd/ppp/lcp_opt_mru.c
index 78e06b5a..78e06b5a 100644
--- a/accel-pptpd/ppp/lcp_opt_mru.c
+++ b/accel-pppd/ppp/lcp_opt_mru.c
diff --git a/accel-pptpd/ppp/lcp_opt_pcomp.c b/accel-pppd/ppp/lcp_opt_pcomp.c
index 1f8532bb..1f8532bb 100644
--- a/accel-pptpd/ppp/lcp_opt_pcomp.c
+++ b/accel-pppd/ppp/lcp_opt_pcomp.c
diff --git a/accel-pptpd/ppp/ppp.c b/accel-pppd/ppp/ppp.c
index 6cf1c720..f578e8eb 100644
--- a/accel-pptpd/ppp/ppp.c
+++ b/accel-pppd/ppp/ppp.c
@@ -625,7 +625,7 @@ static void save_seq(void)
 	FILE *f;
 	char *opt = conf_get_opt("ppp", "seq-file");
 	if (!opt)
-		opt = "/var/run/accel-pptp/seq";
+		opt = "/var/run/accel-ppp/seq";
 
 	f = fopen(opt, "w");
 	if (f) {
@@ -664,7 +664,7 @@ static void __init init(void)
 
 	opt = conf_get_opt("ppp", "seq-file");
 	if (!opt)
-		opt = "/var/run/accel-pptp/seq";
+		opt = "/var/run/accel-ppp/seq";
 	
 	f = fopen(opt, "r");
 	if (f) {
diff --git a/accel-pptpd/ppp/ppp.h b/accel-pppd/ppp/ppp.h
index c633135c..c633135c 100644
--- a/accel-pptpd/ppp/ppp.h
+++ b/accel-pppd/ppp/ppp.h
diff --git a/accel-pptpd/ppp/ppp_auth.c b/accel-pppd/ppp/ppp_auth.c
index 32413c6b..32413c6b 100644
--- a/accel-pptpd/ppp/ppp_auth.c
+++ b/accel-pppd/ppp/ppp_auth.c
diff --git a/accel-pptpd/ppp/ppp_auth.h b/accel-pppd/ppp/ppp_auth.h
index 87cc7420..87cc7420 100644
--- a/accel-pptpd/ppp/ppp_auth.h
+++ b/accel-pppd/ppp/ppp_auth.h
diff --git a/accel-pptpd/ppp/ppp_ccp.c b/accel-pppd/ppp/ppp_ccp.c
index 721dd9b6..721dd9b6 100644
--- a/accel-pptpd/ppp/ppp_ccp.c
+++ b/accel-pppd/ppp/ppp_ccp.c
diff --git a/accel-pptpd/ppp/ppp_ccp.h b/accel-pppd/ppp/ppp_ccp.h
index 2c2dc6dd..2c2dc6dd 100644
--- a/accel-pptpd/ppp/ppp_ccp.h
+++ b/accel-pppd/ppp/ppp_ccp.h
diff --git a/accel-pptpd/ppp/ppp_fsm.c b/accel-pppd/ppp/ppp_fsm.c
index c6bc430e..c6bc430e 100644
--- a/accel-pptpd/ppp/ppp_fsm.c
+++ b/accel-pppd/ppp/ppp_fsm.c
diff --git a/accel-pptpd/ppp/ppp_fsm.h b/accel-pppd/ppp/ppp_fsm.h
index 6010240a..6010240a 100644
--- a/accel-pptpd/ppp/ppp_fsm.h
+++ b/accel-pppd/ppp/ppp_fsm.h
diff --git a/accel-pptpd/ppp/ppp_ipcp.c b/accel-pppd/ppp/ppp_ipcp.c
index 7cdcdbc1..7cdcdbc1 100644
--- a/accel-pptpd/ppp/ppp_ipcp.c
+++ b/accel-pppd/ppp/ppp_ipcp.c
diff --git a/accel-pptpd/ppp/ppp_ipcp.h b/accel-pppd/ppp/ppp_ipcp.h
index c9559872..c9559872 100644
--- a/accel-pptpd/ppp/ppp_ipcp.h
+++ b/accel-pppd/ppp/ppp_ipcp.h
diff --git a/accel-pptpd/ppp/ppp_lcp.c b/accel-pppd/ppp/ppp_lcp.c
index e40e3212..e40e3212 100644
--- a/accel-pptpd/ppp/ppp_lcp.c
+++ b/accel-pppd/ppp/ppp_lcp.c
diff --git a/accel-pptpd/ppp/ppp_lcp.h b/accel-pppd/ppp/ppp_lcp.h
index 6d67b698..6d67b698 100644
--- a/accel-pptpd/ppp/ppp_lcp.h
+++ b/accel-pppd/ppp/ppp_lcp.h
diff --git a/accel-pptpd/ppp/ppp_notify.c b/accel-pppd/ppp/ppp_notify.c
index ad9fd1fc..ad9fd1fc 100644
--- a/accel-pptpd/ppp/ppp_notify.c
+++ b/accel-pppd/ppp/ppp_notify.c
diff --git a/accel-pptpd/ppp/ppp_pd.c b/accel-pppd/ppp/ppp_pd.c
index f7702083..f7702083 100644
--- a/accel-pptpd/ppp/ppp_pd.c
+++ b/accel-pppd/ppp/ppp_pd.c
diff --git a/accel-pptpd/pwdb.c b/accel-pppd/pwdb.c
index 4c0ab02e..4c0ab02e 100644
--- a/accel-pptpd/pwdb.c
+++ b/accel-pppd/pwdb.c
diff --git a/accel-pptpd/pwdb.h b/accel-pppd/pwdb.h
index a1c2cedb..a1c2cedb 100644
--- a/accel-pptpd/pwdb.h
+++ b/accel-pppd/pwdb.h
diff --git a/accel-pptpd/radius/CMakeLists.txt b/accel-pppd/radius/CMakeLists.txt
index 8b8e67d4..322bee51 100644
--- a/accel-pptpd/radius/CMakeLists.txt
+++ b/accel-pppd/radius/CMakeLists.txt
@@ -8,12 +8,12 @@ SET(sources
 	radius.c
 )
 
-ADD_DEFINITIONS(-DDICTIONARY="${CMAKE_INSTALL_PREFIX}/share/accel-pptp/radius/dictionary")
+ADD_DEFINITIONS(-DDICTIONARY="${CMAKE_INSTALL_PREFIX}/share/accel-ppp/radius/dictionary")
 
 ADD_LIBRARY(radius SHARED ${sources})
 
 INSTALL(TARGETS radius
-	LIBRARY DESTINATION lib/accel-pptp
+	LIBRARY DESTINATION lib/accel-ppp
 )
 FILE(GLOB dict "${CMAKE_CURRENT_SOURCE_DIR}/dict/*")
-INSTALL(FILES ${dict} DESTINATION share/accel-pptp/radius)
+INSTALL(FILES ${dict} DESTINATION share/accel-ppp/radius)
diff --git a/accel-pptpd/radius/acct.c b/accel-pppd/radius/acct.c
index ddb3e086..ddb3e086 100644
--- a/accel-pptpd/radius/acct.c
+++ b/accel-pppd/radius/acct.c
diff --git a/accel-pptpd/radius/attr_defs.h b/accel-pppd/radius/attr_defs.h
index e9b617e4..e9b617e4 100644
--- a/accel-pptpd/radius/attr_defs.h
+++ b/accel-pppd/radius/attr_defs.h
diff --git a/accel-pptpd/radius/auth.c b/accel-pppd/radius/auth.c
index 692830ed..692830ed 100644
--- a/accel-pptpd/radius/auth.c
+++ b/accel-pppd/radius/auth.c
diff --git a/accel-pptpd/radius/dict.c b/accel-pppd/radius/dict.c
index 9704569e..9704569e 100644
--- a/accel-pptpd/radius/dict.c
+++ b/accel-pppd/radius/dict.c
diff --git a/accel-pptpd/radius/dict/dictionary b/accel-pppd/radius/dict/dictionary
index 27973105..27973105 100644
--- a/accel-pptpd/radius/dict/dictionary
+++ b/accel-pppd/radius/dict/dictionary
diff --git a/accel-pptpd/radius/dict/dictionary.cisco b/accel-pppd/radius/dict/dictionary.cisco
index 6d1efbe8..6d1efbe8 100644
--- a/accel-pptpd/radius/dict/dictionary.cisco
+++ b/accel-pppd/radius/dict/dictionary.cisco
diff --git a/accel-pptpd/radius/dict/dictionary.microsoft b/accel-pppd/radius/dict/dictionary.microsoft
index 9ca6b8e9..9ca6b8e9 100644
--- a/accel-pptpd/radius/dict/dictionary.microsoft
+++ b/accel-pppd/radius/dict/dictionary.microsoft
diff --git a/accel-pptpd/radius/dict/dictionary.rfc2865 b/accel-pppd/radius/dict/dictionary.rfc2865
index 7e5bf583..7e5bf583 100644
--- a/accel-pptpd/radius/dict/dictionary.rfc2865
+++ b/accel-pppd/radius/dict/dictionary.rfc2865
diff --git a/accel-pptpd/radius/dict/dictionary.rfc2866 b/accel-pppd/radius/dict/dictionary.rfc2866
index 15472bd5..15472bd5 100644
--- a/accel-pptpd/radius/dict/dictionary.rfc2866
+++ b/accel-pppd/radius/dict/dictionary.rfc2866
diff --git a/accel-pptpd/radius/dict/dictionary.rfc2867 b/accel-pppd/radius/dict/dictionary.rfc2867
index b018aba4..b018aba4 100644
--- a/accel-pptpd/radius/dict/dictionary.rfc2867
+++ b/accel-pppd/radius/dict/dictionary.rfc2867
diff --git a/accel-pptpd/radius/dict/dictionary.rfc2868 b/accel-pppd/radius/dict/dictionary.rfc2868
index f6a4047a..f6a4047a 100644
--- a/accel-pptpd/radius/dict/dictionary.rfc2868
+++ b/accel-pppd/radius/dict/dictionary.rfc2868
diff --git a/accel-pptpd/radius/dict/dictionary.rfc2869 b/accel-pppd/radius/dict/dictionary.rfc2869
index 1a2631ec..1a2631ec 100644
--- a/accel-pptpd/radius/dict/dictionary.rfc2869
+++ b/accel-pppd/radius/dict/dictionary.rfc2869
diff --git a/accel-pptpd/radius/dict/dictionary.rfc3576 b/accel-pppd/radius/dict/dictionary.rfc3576
index 35aeb326..35aeb326 100644
--- a/accel-pptpd/radius/dict/dictionary.rfc3576
+++ b/accel-pppd/radius/dict/dictionary.rfc3576
diff --git a/accel-pptpd/radius/dict/dictionary.rfc3580 b/accel-pppd/radius/dict/dictionary.rfc3580
index 1bd4ca3e..1bd4ca3e 100644
--- a/accel-pptpd/radius/dict/dictionary.rfc3580
+++ b/accel-pppd/radius/dict/dictionary.rfc3580
diff --git a/accel-pptpd/radius/dict/dictionary.rfc4072 b/accel-pppd/radius/dict/dictionary.rfc4072
index 2280d075..2280d075 100644
--- a/accel-pptpd/radius/dict/dictionary.rfc4072
+++ b/accel-pppd/radius/dict/dictionary.rfc4072
diff --git a/accel-pptpd/radius/dict/dictionary.rfc4372 b/accel-pppd/radius/dict/dictionary.rfc4372
index b8af44ac..b8af44ac 100644
--- a/accel-pptpd/radius/dict/dictionary.rfc4372
+++ b/accel-pppd/radius/dict/dictionary.rfc4372
diff --git a/accel-pptpd/radius/dict/dictionary.rfc4675 b/accel-pppd/radius/dict/dictionary.rfc4675
index 8d1187f4..8d1187f4 100644
--- a/accel-pptpd/radius/dict/dictionary.rfc4675
+++ b/accel-pppd/radius/dict/dictionary.rfc4675
diff --git a/accel-pptpd/radius/dict/dictionary.rfc4679 b/accel-pppd/radius/dict/dictionary.rfc4679
index 39892a54..39892a54 100644
--- a/accel-pptpd/radius/dict/dictionary.rfc4679
+++ b/accel-pppd/radius/dict/dictionary.rfc4679
diff --git a/accel-pptpd/radius/dict/dictionary.rfc4818 b/accel-pppd/radius/dict/dictionary.rfc4818
index 4ea59452..4ea59452 100644
--- a/accel-pptpd/radius/dict/dictionary.rfc4818
+++ b/accel-pppd/radius/dict/dictionary.rfc4818
diff --git a/accel-pptpd/radius/dict/dictionary.rfc4849 b/accel-pppd/radius/dict/dictionary.rfc4849
index 1738eea0..1738eea0 100644
--- a/accel-pptpd/radius/dict/dictionary.rfc4849
+++ b/accel-pppd/radius/dict/dictionary.rfc4849
diff --git a/accel-pptpd/radius/dict/dictionary.rfc5176 b/accel-pppd/radius/dict/dictionary.rfc5176
index 93089612..93089612 100644
--- a/accel-pptpd/radius/dict/dictionary.rfc5176
+++ b/accel-pppd/radius/dict/dictionary.rfc5176
diff --git a/accel-pptpd/radius/dict2c.py b/accel-pppd/radius/dict2c.py
index ff0961e7..ff0961e7 100644
--- a/accel-pptpd/radius/dict2c.py
+++ b/accel-pppd/radius/dict2c.py
diff --git a/accel-pptpd/radius/dm_coa.c b/accel-pppd/radius/dm_coa.c
index 366bb417..366bb417 100644
--- a/accel-pptpd/radius/dm_coa.c
+++ b/accel-pppd/radius/dm_coa.c
diff --git a/accel-pptpd/radius/packet.c b/accel-pppd/radius/packet.c
index 4e24dedc..4e24dedc 100644
--- a/accel-pptpd/radius/packet.c
+++ b/accel-pppd/radius/packet.c
diff --git a/accel-pptpd/radius/radius.c b/accel-pppd/radius/radius.c
index 8976a330..8976a330 100644
--- a/accel-pptpd/radius/radius.c
+++ b/accel-pppd/radius/radius.c
diff --git a/accel-pptpd/radius/radius.h b/accel-pppd/radius/radius.h
index ad229d22..ad229d22 100644
--- a/accel-pptpd/radius/radius.h
+++ b/accel-pppd/radius/radius.h
diff --git a/accel-pptpd/radius/radius_p.h b/accel-pppd/radius/radius_p.h
index 71c1a637..71c1a637 100644
--- a/accel-pptpd/radius/radius_p.h
+++ b/accel-pppd/radius/radius_p.h
diff --git a/accel-pptpd/radius/req.c b/accel-pppd/radius/req.c
index a384f236..a384f236 100644
--- a/accel-pptpd/radius/req.c
+++ b/accel-pppd/radius/req.c
diff --git a/accel-pptpd/triton/CMakeLists.txt b/accel-pppd/triton/CMakeLists.txt
index 0c6786d9..105b62a6 100644
--- a/accel-pptpd/triton/CMakeLists.txt
+++ b/accel-pppd/triton/CMakeLists.txt
@@ -23,18 +23,18 @@ ELSE (HAVE_TIMERFD)
 		syscall(SYS_timerfd_create);
 	}" HAVE_SYSCALL)
 	IF (NOT HAVE_SYSCALL)
-		MESSAGE(FATAL_ERROR "Your system is too old and is not supported by accel-pptp, sorry...")
+		MESSAGE(FATAL_ERROR "Your system is too old and is not supported by accel-ppp, sorry...")
 	ENDIF (NOT HAVE_SYSCALL)
 	SET(sources_c ${sources_c} timerfd.c)
 ENDIF (HAVE_TIMERFD)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_DEFINITIONS(-DMODULE_PATH="${CMAKE_INSTALL_PREFIX}/lib/accel-pptp")
+ADD_DEFINITIONS(-DMODULE_PATH="${CMAKE_INSTALL_PREFIX}/lib/accel-ppp")
 
 ADD_LIBRARY(triton SHARED ${sources_c})
 TARGET_LINK_LIBRARIES(triton dl)
 
 INSTALL(TARGETS triton
-	LIBRARY DESTINATION lib/accel-pptp
+	LIBRARY DESTINATION lib/accel-ppp
 )
diff --git a/accel-pptpd/triton/conf_file.c b/accel-pppd/triton/conf_file.c
index ce8549c9..ce8549c9 100644
--- a/accel-pptpd/triton/conf_file.c
+++ b/accel-pppd/triton/conf_file.c
diff --git a/accel-pptpd/triton/event.c b/accel-pppd/triton/event.c
index d45eca01..d45eca01 100644
--- a/accel-pptpd/triton/event.c
+++ b/accel-pppd/triton/event.c
diff --git a/accel-pptpd/triton/list.h b/accel-pppd/triton/list.h
index d95dd714..d95dd714 100644
--- a/accel-pptpd/triton/list.h
+++ b/accel-pppd/triton/list.h
diff --git a/accel-pptpd/triton/loader.c b/accel-pppd/triton/loader.c
index 2a2a2e2f..2a2a2e2f 100644
--- a/accel-pptpd/triton/loader.c
+++ b/accel-pppd/triton/loader.c
diff --git a/accel-pptpd/triton/log.c b/accel-pppd/triton/log.c
index c7e6b7fe..c7e6b7fe 100644
--- a/accel-pptpd/triton/log.c
+++ b/accel-pppd/triton/log.c
diff --git a/accel-pptpd/triton/md.c b/accel-pppd/triton/md.c
index 84073d05..84073d05 100644
--- a/accel-pptpd/triton/md.c
+++ b/accel-pppd/triton/md.c
diff --git a/accel-pptpd/triton/mempool.c b/accel-pppd/triton/mempool.c
index 855e22e8..855e22e8 100644
--- a/accel-pptpd/triton/mempool.c
+++ b/accel-pppd/triton/mempool.c
diff --git a/accel-pptpd/triton/mempool.h b/accel-pppd/triton/mempool.h
index bdb3e712..bdb3e712 100644
--- a/accel-pptpd/triton/mempool.h
+++ b/accel-pppd/triton/mempool.h
diff --git a/accel-pptpd/triton/options.c b/accel-pppd/triton/options.c
index a5214e21..a5214e21 100644
--- a/accel-pptpd/triton/options.c
+++ b/accel-pppd/triton/options.c
diff --git a/accel-pptpd/triton/spinlock.h b/accel-pppd/triton/spinlock.h
index bb8dcf44..bb8dcf44 100644
--- a/accel-pptpd/triton/spinlock.h
+++ b/accel-pppd/triton/spinlock.h
diff --git a/accel-pptpd/triton/timer.c b/accel-pppd/triton/timer.c
index e419e938..e419e938 100644
--- a/accel-pptpd/triton/timer.c
+++ b/accel-pppd/triton/timer.c
diff --git a/accel-pptpd/triton/timerfd.c b/accel-pppd/triton/timerfd.c
index b026258f..b026258f 100644
--- a/accel-pptpd/triton/timerfd.c
+++ b/accel-pppd/triton/timerfd.c
diff --git a/accel-pptpd/triton/timerfd.h b/accel-pppd/triton/timerfd.h
index c1bb06f5..c1bb06f5 100644
--- a/accel-pptpd/triton/timerfd.h
+++ b/accel-pppd/triton/timerfd.h
diff --git a/accel-pptpd/triton/triton.c b/accel-pppd/triton/triton.c
index 00dfcf6e..00dfcf6e 100644
--- a/accel-pptpd/triton/triton.c
+++ b/accel-pppd/triton/triton.c
diff --git a/accel-pptpd/triton/triton.h b/accel-pppd/triton/triton.h
index 6866d523..6866d523 100644
--- a/accel-pptpd/triton/triton.h
+++ b/accel-pppd/triton/triton.h
diff --git a/accel-pptpd/triton/triton_p.h b/accel-pppd/triton/triton_p.h
index 235eb701..235eb701 100644
--- a/accel-pptpd/triton/triton_p.h
+++ b/accel-pppd/triton/triton_p.h
diff --git a/accel-pptpd/utils.c b/accel-pppd/utils.c
index 491e6507..491e6507 100644
--- a/accel-pptpd/utils.c
+++ b/accel-pppd/utils.c
diff --git a/accel-pptpd/utils.h b/accel-pppd/utils.h
index 27d4d058..27d4d058 100644
--- a/accel-pptpd/utils.h
+++ b/accel-pppd/utils.h