diff --git a/share/examples/Makefile b/share/examples/Makefile
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -349,10 +349,10 @@
 	sort_proc.c
 
 .if ${MK_EFI} != "no"
-LDIRS+=		uefisign
-SE_DIRS+=	uefisign
-SE_UEFISIGN=	uefikeys
-SE_UEFISIGNPACKAGE=efi-tools
+LDIRS+=		efisign
+SE_DIRS+=	efisign
+SE_EFISIGN=	uefikeys
+SE_EFISIGNPACKAGE=efi-tools
 .endif
 
 SE_DIRS+=	ypldap
diff --git a/share/examples/uefisign/uefikeys b/share/examples/efisign/uefikeys
rename from share/examples/uefisign/uefikeys
rename to share/examples/efisign/uefikeys
--- a/share/examples/uefisign/uefikeys
+++ b/share/examples/efisign/uefikeys
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# See uefisign(8) manual page for usage instructions.
+# See efisign(8) manual page for usage instructions.
 #
 #
 
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -133,7 +133,7 @@
 SUBDIR.${MK_CXGBETOOL}+=	cxgbetool
 SUBDIR.${MK_EFI}+=	efivar efidp efibootmgr efitable efiwake
 .if ${MK_OPENSSL} != "no"
-SUBDIR.${MK_EFI}+=	uefisign
+SUBDIR.${MK_EFI}+=	efisign
 .endif
 SUBDIR.${MK_FDT}+=	ofwdump
 SUBDIR.${MK_FLOPPY}+=	fdcontrol
diff --git a/usr.sbin/efisign/Makefile b/usr.sbin/efisign/Makefile
new file mode 100644
--- /dev/null
+++ b/usr.sbin/efisign/Makefile
@@ -0,0 +1,11 @@
+PROG=	efisign
+SRCS=	efisign.c child.c pe.c
+MAN=	efisign.8
+
+# Compatibility links
+LINKS=		$(BINDIR)/efisign $(BINDIR)/uefisign
+MANLINKS=	efisign.8 uefisign.8
+
+LIBADD=	crypto
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/uefisign/Makefile.depend b/usr.sbin/efisign/Makefile.depend
rename from usr.sbin/uefisign/Makefile.depend
rename to usr.sbin/efisign/Makefile.depend
diff --git a/usr.sbin/uefisign/child.c b/usr.sbin/efisign/child.c
rename from usr.sbin/uefisign/child.c
rename to usr.sbin/efisign/child.c
--- a/usr.sbin/uefisign/child.c
+++ b/usr.sbin/efisign/child.c
@@ -46,7 +46,7 @@
 #include <openssl/err.h>
 #include <openssl/pem.h>
 
-#include "uefisign.h"
+#include "efisign.h"
 
 static void
 load(struct executable *x)
diff --git a/usr.sbin/uefisign/uefisign.h b/usr.sbin/efisign/efisign.h
rename from usr.sbin/uefisign/uefisign.h
rename to usr.sbin/efisign/efisign.h
diff --git a/usr.sbin/uefisign/uefisign.8 b/usr.sbin/efisign/efisign.8
rename from usr.sbin/uefisign/uefisign.8
rename to usr.sbin/efisign/efisign.8
--- a/usr.sbin/uefisign/uefisign.8
+++ b/usr.sbin/efisign/efisign.8
@@ -24,11 +24,11 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd July 11, 2015
-.Dt UEFISIGN 8
+.Dd July 11, 2026
+.Dt EFISIGN 8
 .Os
 .Sh NAME
-.Nm uefisign
+.Nm efisign
 .Nd UEFI Secure Boot signing utility
 .Sh SYNOPSIS
 .Nm
@@ -68,11 +68,11 @@
 utility exits 0 on success, and >0 if an error occurs.
 .Sh EXAMPLES
 Generate self-signed certificate and use it to sign a binary:
-.Dl /usr/share/examples/uefisign/uefikeys testcert
-.Dl uefisign -c testcert.pem -k testcert.key -o signed-binary binary
+.Dl /usr/share/examples/efisign/efikeys testcert
+.Dl efisign -c testcert.pem -k testcert.key -o signed-binary binary
 .Pp
 View signature:
-.Dl uefisign -Vv binary
+.Dl efisign -Vv binary
 .Sh SEE ALSO
 .Xr openssl 1 ,
 .Xr loader 8 ,
diff --git a/usr.sbin/uefisign/uefisign.c b/usr.sbin/efisign/efisign.c
rename from usr.sbin/uefisign/uefisign.c
rename to usr.sbin/efisign/efisign.c
--- a/usr.sbin/uefisign/uefisign.c
+++ b/usr.sbin/efisign/efisign.c
@@ -44,15 +44,15 @@
 #include <openssl/pem.h>
 #include <openssl/pkcs7.h>
 
-#include "uefisign.h"
+#include "efisign.h"
 #include "magic.h"
 
 static void
 usage(void)
 {
 
-	fprintf(stderr, "usage: uefisign -c cert -k key -o outfile [-v] file\n"
-			"       uefisign -V [-c cert] [-v] file\n");
+	fprintf(stderr, "usage: efisign -c cert -k key -o outfile [-v] file\n"
+			"       efisign -V [-c cert] [-v] file\n");
 	exit(1);
 }
 
diff --git a/usr.sbin/uefisign/magic.h b/usr.sbin/efisign/magic.h
rename from usr.sbin/uefisign/magic.h
rename to usr.sbin/efisign/magic.h
diff --git a/usr.sbin/uefisign/pe.c b/usr.sbin/efisign/pe.c
rename from usr.sbin/uefisign/pe.c
rename to usr.sbin/efisign/pe.c
--- a/usr.sbin/uefisign/pe.c
+++ b/usr.sbin/efisign/pe.c
@@ -45,7 +45,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "uefisign.h"
+#include "efisign.h"
 
 #ifndef CTASSERT
 #define CTASSERT(x)		_CTASSERT(x, __LINE__)
diff --git a/usr.sbin/uefisign/Makefile b/usr.sbin/uefisign/Makefile
deleted file mode 100644
--- a/usr.sbin/uefisign/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-PROG=	uefisign
-SRCS=	uefisign.c child.c pe.c
-MAN=	uefisign.8
-
-LIBADD=	crypto
-
-.include <bsd.prog.mk>