Fixed name demangling for cvr_saved types