diff --git a/sys/boot/Makefile.amd64 b/sys/boot/Makefile.amd64
index 5e730bd6c62f..1061a9d17552 100644
--- a/sys/boot/Makefile.amd64
+++ b/sys/boot/Makefile.amd64
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SUBDIR+=		efi
-SUBDIR+=		libstand32
+SUBDIR+=		libsa32
 SUBDIR+=		zfs
 SUBDIR+=		userboot
 
diff --git a/sys/boot/Makefile.i386 b/sys/boot/Makefile.i386
index 7c1990558ea7..a414f4b8c39d 100644
--- a/sys/boot/Makefile.i386
+++ b/sys/boot/Makefile.i386
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SUBDIR+=		efi
-SUBDIR+=		libstand32
+SUBDIR+=		libsa32
 SUBDIR+=		zfs
 
 .if !defined(LOADER_NO_GELI_SUPPORT)
diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc
index 346ca9c2076f..eaa62df8fec3 100644
--- a/sys/boot/Makefile.inc
+++ b/sys/boot/Makefile.inc
@@ -5,11 +5,11 @@
 .if !defined(__BOOT_MAKEFILE_INC__)
 __BOOT_MAKEFILE_INC__=${MFILE}
 
-SASRC=${SRCTOP}/lib/libstand
-# Normal standalone library
-LIBSA=${OBJTOP}/sys/boot/libsa/libstand.a
+SASRC=${SRCTOP}/sys/boot/libsa
+# Normal Standalone library
+LIBSA=${OBJTOP}/sys/boot/libsa/libsa.a
 # Standalone library compiled for 32-bit version of the processor
-LIBSA32=${OBJTOP}/sys/boot/libstand32/libstand.a
+LIBSA32=${OBJTOP}/sys/boot/libsa32/libsa32.a
 
 CFLAGS+=-I${SASRC}
 
diff --git a/sys/boot/Makefile.powerpc b/sys/boot/Makefile.powerpc
index 6d76e7094511..a1347d218ecd 100644
--- a/sys/boot/Makefile.powerpc
+++ b/sys/boot/Makefile.powerpc
@@ -4,6 +4,6 @@
 SUBDIR+=		fdt
 .endif
 
-SUBDIR+=		libstand32
+SUBDIR+=		libsa32
 SUBDIR+=		ofw
 SUBDIR+=		uboot
diff --git a/sys/boot/libsa/Makefile b/sys/boot/libsa/Makefile
index 83238e8215f7..2e9c304ac232 100644
--- a/sys/boot/libsa/Makefile
+++ b/sys/boot/libsa/Makefile
@@ -17,7 +17,7 @@ INTERNALLIB=
 LIBSTAND_CPUARCH?=${MACHINE_CPUARCH}
 LIBC_SRC=	${SRCTOP}/lib/libc
 
-LIB?=		stand
+LIB?=		sa
 NO_PIC=
 WARNS?=		0
 
diff --git a/sys/boot/libstand32/Makefile b/sys/boot/libsa32/Makefile
similarity index 95%
rename from sys/boot/libstand32/Makefile
rename to sys/boot/libsa32/Makefile
index a2013cf77480..69c0374fdb37 100644
--- a/sys/boot/libstand32/Makefile
+++ b/sys/boot/libsa32/Makefile
@@ -4,20 +4,18 @@
 
 .include "../Makefile.inc"
 
+LIB=sa32
 .if ${MACHINE_CPUARCH} == "amd64"
 LIBSTAND_CPUARCH=i386
 .else
 LIBSTAND_CPUARCH=${MACHINE_CPUARCH}
 .endif
-INTERNALLIB=
-INCS=
-MAN=
-.PATH:	${SASRC}
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=	-m32 -I.
 .endif
 
+.PATH:	${SASRC}
 .include "${SASRC}/Makefile"
 
 .if ${MACHINE_CPUARCH} == "amd64"
diff --git a/sys/boot/libstand32/Makefile.depend b/sys/boot/libsa32/Makefile.depend
similarity index 100%
rename from sys/boot/libstand32/Makefile.depend
rename to sys/boot/libsa32/Makefile.depend