Use new descriptors for 4.1.x

Signed-off-by: Fred Bricon <fbricon@gmail.com>