We want to use the new names in our code
(cherry picked from commit 6689109fee1f315dfc1931e5263e9a4aa6f8cff3)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>