Switch to using names from the DRM.