diff --git a/configure.ac b/configure.ac
index 26bb1c4349..cce8db9705 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3124,9 +3124,9 @@ fi
 
 
 dnl
-dnl Intel QuickSync (aka MediaSDK) H264/H262 encoder
+dnl Intel Video Processing Library
 dnl
-PKG_ENABLE_MODULES_VLC([MFX], [qsv], [libmfx], [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto])
+PKG_ENABLE_MODULES_VLC([VPL], [qsv], [vpl], [Intel Video Processing Library encoder], [auto])
 
 
 dnl
diff --git a/meson_options.txt b/meson_options.txt
index d18e28d45b..2967e56415 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -339,10 +339,10 @@ option('twolame',
     value : 'auto',
     description : 'Enable/disable twolame support')
 
-option('mfx',
+option('vpl',
     type : 'feature',
     value : 'auto',
-    description : 'Enable/disable libmfx support')
+    description : 'Enable/disable libvpl support')
 
 option('spatialaudio',
     type : 'feature',
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 97e59fee00..9ef83c7a57 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -617,9 +617,9 @@ codec_LTLIBRARIES += $(LTLIBdav1d)
 ### Hardware encoders ###
 
 libqsv_plugin_la_SOURCES = codec/qsv.c demux/mpeg/timestamps.h
-libqsv_plugin_la_CFLAGS = $(AM_CFLAGS) $(MFX_CFLAGS)
+libqsv_plugin_la_CFLAGS = $(AM_CFLAGS) $(VPL_CFLAGS)
 libqsv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
-libqsv_plugin_la_LIBADD = $(MFX_LIBS)
+libqsv_plugin_la_LIBADD = $(VPL_LIBS)
 EXTRA_LTLIBRARIES += libqsv_plugin.la
 codec_LTLIBRARIES += $(LTLIBqsv)
 
diff --git a/modules/codec/meson.build b/modules/codec/meson.build
index e730e7d542..3893ed9616 100644
--- a/modules/codec/meson.build
+++ b/modules/codec/meson.build
@@ -886,7 +886,7 @@ vlc_modules += {
 ## Hardware encoders
 
 # QSV encoder
-qsv_dep = dependency('libmfx', required: get_option('mfx'))
+qsv_dep = dependency('vpl', required: get_option('vpl'))
 vlc_modules += {
     'name' : 'qsv',
     'sources' : files('qsv.c'),
diff --git a/modules/codec/qsv.c b/modules/codec/qsv.c
index 6d268c2f47..56e4d52c84 100644
--- a/modules/codec/qsv.c
+++ b/modules/codec/qsv.c
@@ -36,7 +36,7 @@
 #include <vlc_list.h>
 
 
-#include <mfx/mfxvideo.h>
+#include <vpl/mfxvideo.h>
 #include "../demux/mpeg/timestamps.h"
 
 #define SOUT_CFG_PREFIX     "sout-qsv-"