15 files changed, 20 insertions, 20 deletions
diff --git a/package/deps.mak b/package/deps.mak
index e60d782..1821dba 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -2,24 +2,24 @@
 # This file has been generated by tools/gen-deps.sh
 #
 
-src/qmail-smtpc/qmail-smtpc.h: src/qmail-smtpc/qmailr.h
-src/qmail-smtpc/dns.o src/qmail-smtpc/dns.lo: src/qmail-smtpc/dns.c src/qmail-smtpc/qmail-smtpc.h src/qmail-smtpc/qmailr.h
-src/qmail-smtpc/qmail-smtpc.o src/qmail-smtpc/qmail-smtpc.lo: src/qmail-smtpc/qmail-smtpc.c src/qmail-smtpc/qmail-smtpc.h src/qmail-smtpc/qmailr.h src/include/smtpd-starttls-proxy/config.h
-src/qmail-smtpc/qmailr_control.o src/qmail-smtpc/qmailr_control.lo: src/qmail-smtpc/qmailr_control.c src/qmail-smtpc/qmailr.h
-src/qmail-smtpc/qmailr_error.o src/qmail-smtpc/qmailr_error.lo: src/qmail-smtpc/qmailr_error.c src/include/smtpd-starttls-proxy/config.h
-src/qmail-smtpc/qmailr_tcpto.o src/qmail-smtpc/qmailr_tcpto.lo: src/qmail-smtpc/qmailr_tcpto.c src/qmail-smtpc/qmailr.h src/include/smtpd-starttls-proxy/config.h
-src/qmail-smtpc/qmailr_tls.o src/qmail-smtpc/qmailr_tls.lo: src/qmail-smtpc/qmailr_tls.c src/qmail-smtpc/qmailr.h src/include/smtpd-starttls-proxy/config.h
-src/qmail-smtpc/qmailr_utils.o src/qmail-smtpc/qmailr_utils.lo: src/qmail-smtpc/qmailr_utils.c src/qmail-smtpc/qmailr.h
-src/qmail-smtpc/smtproutes.o src/qmail-smtpc/smtproutes.lo: src/qmail-smtpc/smtproutes.c src/qmail-smtpc/qmail-smtpc.h src/qmail-smtpc/qmailr.h src/include/smtpd-starttls-proxy/config.h
+src/qmail-remote/qmail-remote.h: src/qmail-remote/qmailr.h
+src/qmail-remote/dns.o src/qmail-remote/dns.lo: src/qmail-remote/dns.c src/qmail-remote/qmail-remote.h src/qmail-remote/qmailr.h
+src/qmail-remote/qmail-remote.o src/qmail-remote/qmail-remote.lo: src/qmail-remote/qmail-remote.c src/qmail-remote/qmail-remote.h src/qmail-remote/qmailr.h src/include/smtpd-starttls-proxy/config.h
+src/qmail-remote/qmailr_control.o src/qmail-remote/qmailr_control.lo: src/qmail-remote/qmailr_control.c src/qmail-remote/qmailr.h
+src/qmail-remote/qmailr_error.o src/qmail-remote/qmailr_error.lo: src/qmail-remote/qmailr_error.c src/include/smtpd-starttls-proxy/config.h
+src/qmail-remote/qmailr_tcpto.o src/qmail-remote/qmailr_tcpto.lo: src/qmail-remote/qmailr_tcpto.c src/qmail-remote/qmailr.h src/include/smtpd-starttls-proxy/config.h
+src/qmail-remote/qmailr_tls.o src/qmail-remote/qmailr_tls.lo: src/qmail-remote/qmailr_tls.c src/qmail-remote/qmailr.h src/include/smtpd-starttls-proxy/config.h
+src/qmail-remote/qmailr_utils.o src/qmail-remote/qmailr_utils.lo: src/qmail-remote/qmailr_utils.c src/qmail-remote/qmailr.h
+src/qmail-remote/smtproutes.o src/qmail-remote/smtproutes.lo: src/qmail-remote/smtproutes.c src/qmail-remote/qmail-remote.h src/qmail-remote/qmailr.h src/include/smtpd-starttls-proxy/config.h
 src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.o src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.lo: src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.c
 
 ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
-libqmailr.a.xyzzy: src/qmail-smtpc/qmailr_control.o src/qmail-smtpc/qmailr_error.o src/qmail-smtpc/qmailr_tcpto.o src/qmail-smtpc/qmailr_tls.o src/qmail-smtpc/qmailr_utils.o
+libqmailr.a.xyzzy: src/qmail-remote/qmailr_control.o src/qmail-remote/qmailr_error.o src/qmail-remote/qmailr_tcpto.o src/qmail-remote/qmailr_tls.o src/qmail-remote/qmailr_utils.o
 else
-libqmailr.a.xyzzy:src/qmail-smtpc/qmailr_control.lo src/qmail-smtpc/qmailr_error.lo src/qmail-smtpc/qmailr_tcpto.lo src/qmail-smtpc/qmailr_tls.lo src/qmail-smtpc/qmailr_utils.lo
+libqmailr.a.xyzzy:src/qmail-remote/qmailr_control.lo src/qmail-remote/qmailr_error.lo src/qmail-remote/qmailr_tcpto.lo src/qmail-remote/qmailr_tls.lo src/qmail-remote/qmailr_utils.lo
 endif
-qmail-smtpc: EXTRA_LIBS :=
-qmail-smtpc: src/qmail-smtpc/qmail-smtpc.o src/qmail-smtpc/dns.o src/qmail-smtpc/smtproutes.o libqmailr.a.xyzzy -lskadns -ls6dns -lskarnet
+qmail-remote: EXTRA_LIBS :=
+qmail-remote: src/qmail-remote/qmail-remote.o src/qmail-remote/dns.o src/qmail-remote/smtproutes.o libqmailr.a.xyzzy -lskadns -ls6dns -lskarnet
 smtpd-starttls-proxy-io: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
 smtpd-starttls-proxy-io: src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.o -lskarnet
 INTERNAL_LIBS := libqmailr.a.xyzzy
diff --git a/package/modes b/package/modes
index e22534f..c005314 100644
--- a/package/modes
+++ b/package/modes
@@ -1,2 +1,2 @@
 smtpd-starttls-proxy-io	0755
-qmail-smtpc		0755
+qmail-remote		0755
diff --git a/package/targets.mak b/package/targets.mak
index c4707f9..917dfad 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -1,6 +1,6 @@
 BIN_TARGETS := \
 smtpd-starttls-proxy-io \
-qmail-smtpc
+qmail-remote
 
 LIBEXEC_TARGETS :=
 
diff --git a/src/qmail-smtpc/deps-exe/qmail-smtpc b/src/qmail-remote/deps-exe/qmail-remote
index 4484f9b..4484f9b 100644
--- a/src/qmail-smtpc/deps-exe/qmail-smtpc
+++ b/src/qmail-remote/deps-exe/qmail-remote
diff --git a/src/qmail-smtpc/deps-lib/qmailr b/src/qmail-remote/deps-lib/qmailr
index c1095ed..c1095ed 100644
--- a/src/qmail-smtpc/deps-lib/qmailr
+++ b/src/qmail-remote/deps-lib/qmailr
diff --git a/src/qmail-smtpc/dns.c b/src/qmail-remote/dns.c
index 90aade4..4649fc7 100644
--- a/src/qmail-smtpc/dns.c
+++ b/src/qmail-remote/dns.c
@@ -17,7 +17,7 @@
 #include <s6-dns/skadns.h>
 
 #include "qmailr.h"
-#include "qmail-smtpc.h"
+#include "qmail-remote.h"
 
 typedef struct cnameinfo_s cnameinfo, *cnameinfo_ref ;
 struct cnameinfo_s
diff --git a/src/qmail-smtpc/qmail-smtpc.c b/src/qmail-remote/qmail-remote.c
index 0e0b11b..870c797 100644
--- a/src/qmail-smtpc/qmail-smtpc.c
+++ b/src/qmail-remote/qmail-remote.c
@@ -12,7 +12,7 @@
 
 #include <smtpd-starttls-proxy/config.h>
 #include "qmailr.h"
-#include "qmail-smtpc.h"
+#include "qmail-remote.h"
 
 #define dieusage() qmailr_perm("qmail-remote was invoked improperly")
 
diff --git a/src/qmail-smtpc/qmail-smtpc.h b/src/qmail-remote/qmail-remote.h
index 29aa792..8059344 100644
--- a/src/qmail-smtpc/qmail-smtpc.h
+++ b/src/qmail-remote/qmail-remote.h
@@ -1,7 +1,7 @@
 /* ISC license. */
 
-#ifndef QMAIL_SMTPC_H
-#define QMAIL_SMTPC_H
+#ifndef QMAIL_REMOTE_H
+#define QMAIL_REMOTE_H
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/qmail-smtpc/qmailr.h b/src/qmail-remote/qmailr.h
index 08c4f41..08c4f41 100644
--- a/src/qmail-smtpc/qmailr.h
+++ b/src/qmail-remote/qmailr.h
diff --git a/src/qmail-smtpc/qmailr_control.c b/src/qmail-remote/qmailr_control.c
index 706b0d9..706b0d9 100644
--- a/src/qmail-smtpc/qmailr_control.c
+++ b/src/qmail-remote/qmailr_control.c
diff --git a/src/qmail-smtpc/qmailr_error.c b/src/qmail-remote/qmailr_error.c
index fcdce54..fcdce54 100644
--- a/src/qmail-smtpc/qmailr_error.c
+++ b/src/qmail-remote/qmailr_error.c
diff --git a/src/qmail-smtpc/qmailr_tcpto.c b/src/qmail-remote/qmailr_tcpto.c
index f90d1d0..f90d1d0 100644
--- a/src/qmail-smtpc/qmailr_tcpto.c
+++ b/src/qmail-remote/qmailr_tcpto.c
diff --git a/src/qmail-smtpc/qmailr_tls.c b/src/qmail-remote/qmailr_tls.c
index 6e09a82..6e09a82 100644
--- a/src/qmail-smtpc/qmailr_tls.c
+++ b/src/qmail-remote/qmailr_tls.c
diff --git a/src/qmail-smtpc/qmailr_utils.c b/src/qmail-remote/qmailr_utils.c
index deeff46..deeff46 100644
--- a/src/qmail-smtpc/qmailr_utils.c
+++ b/src/qmail-remote/qmailr_utils.c
diff --git a/src/qmail-smtpc/smtproutes.c b/src/qmail-remote/smtproutes.c
index d5b1fac..7467031 100644
--- a/src/qmail-smtpc/smtproutes.c
+++ b/src/qmail-remote/smtproutes.c
@@ -21,7 +21,7 @@
 
 #include <smtpd-starttls-proxy/config.h>
 #include "qmailr.h"
-#include "qmail-smtpc.h"
+#include "qmail-remote.h"
 
 
 /*