diff --git a/graphics/libheif/Makefile b/graphics/libheif/Makefile
index 50a854fd2388..08420ff65b9b 100644
--- a/graphics/libheif/Makefile
+++ b/graphics/libheif/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	libheif
 DISTVERSION=	1.14.0
 PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/strukturag/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	ISO/IEC 23008-12:2017 HEIF file format de- and encoder
 WWW=		https://github.com/strukturag/libheif
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake compiler:c++11-lang cpe gettext-runtime gnome \
 		localbase:ldflags pkgconfig shared-mime-info
 CPE_VENDOR=	struktur
 USE_GNOME=	gdkpixbuf2 glib20
 USE_LDCONFIG=	yes
 PLIST_SUB=	LIB_VER=${DISTVERSION}.0
 
-OPTIONS_DEFINE=		AOM DAV1D EXAMPLES LIBDE265 SVT RAV1E X265
+OPTIONS_DEFINE=		AOM DAV1D EXAMPLES LIBDE265 SVTAV1 RAV1E X265
 OPTIONS_DEFAULT=	AOM DAV1D LIBDE265 X265
 OPTIONS_SUB=	yes
 
 AOM_DESC=		AV1 encoding/decoding via libaom
 DAV1D_DESC=		Build dav1e decoder
 LIBDE265_DESC=		Use libde265 (support for HEVC decoding)
-SVT_DESC=		Build svt-av1 encoder
+SVTAV1_DESC=		Build svt-av1 encoder
 RAV1E_DESC=		Build rav1e encoder
 X265_DESC=		Use x265 (support for HEVC encoding)
 
 AOM_LIB_DEPENDS=	libaom.so:multimedia/aom
 AOM_CMAKE_BOOL=		WITH_AOM_ENCODER WITH_AOM_DECODER
 
 DAV1D_LIB_DEPENDS=	libdav1d.so:multimedia/dav1d
 DAV1D_CMAKE_BOOL=	WITH_DAV1D
 
 EXAMPLES_LIB_DEPENDS=	libpng16.so:graphics/png
 EXAMPLES_USES=		jpeg
 EXAMPLES_CMAKE_BOOL=	WITH_EXAMPLES
 
 LIBDE265_LIB_DEPENDS=	libde265.so:multimedia/libde265
 LIBDE265_CMAKE_BOOL=	WITH_LIBDE265
 
-SVT_LIB_DEPENDS=	libSvtAv1Enc.so:multimedia/svt-av1
-SVT_CMAKE_BOOL=		WITH_SvtEnc
-SVT_BROKEN=		breaks some dependent ports
+SVTAV1_LIB_DEPENDS=	libSvtAv1Enc.so:multimedia/svt-av1
+SVTAV1_CMAKE_BOOL=	WITH_SvtEnc
+SVTAV1_BROKEN=		breaks some dependent ports
 
 RAV1E_LIB_DEPENDS=	librav1e.so:multimedia/librav1e
 RAV1E_CMAKE_BOOL=	WITH_RAV1E
 
 X265_LIB_DEPENDS=	libx265.so:multimedia/x265
 X265_CMAKE_BOOL=	WITH_X265
 
 .include <bsd.port.mk>
diff --git a/graphics/libheif/pkg-plist b/graphics/libheif/pkg-plist
index a397c9f6cc28..2bd514d0046e 100644
--- a/graphics/libheif/pkg-plist
+++ b/graphics/libheif/pkg-plist
@@ -1,25 +1,25 @@
 %%PORTEXAMPLES%%bin/heif-convert
 %%PORTEXAMPLES%%bin/heif-enc
 %%PORTEXAMPLES%%bin/heif-info
 %%PORTEXAMPLES%%bin/heif-thumbnailer
 include/libheif/heif.h
 include/libheif/heif_cxx.h
 include/libheif/heif_plugin.h
 include/libheif/heif_version.h
 lib/cmake/libheif/libheif-config-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/libheif/libheif-config-version.cmake
 lib/cmake/libheif/libheif-config.cmake
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-heif.so
 lib/libheif.so
 lib/libheif.so.1
 lib/libheif.so.%%LIB_VER%%
-%%SVT%%lib/libheif/libheif-svtenc.so
+%%SVTAV1%%lib/libheif/libheif-svtenc.so
 %%RAV1E%%lib/libheif/libheif-rav1e.so
 libdata/pkgconfig/libheif.pc
 %%PORTEXAMPLES%%share/man/man1/heif-convert.1.gz
 %%PORTEXAMPLES%%share/man/man1/heif-enc.1.gz
 %%PORTEXAMPLES%%share/man/man1/heif-info.1.gz
 %%PORTEXAMPLES%%share/man/man1/heif-thumbnailer.1.gz
 share/mime/packages/avif.xml
 share/mime/packages/heif.xml
 share/thumbnailers/heif.thumbnailer