Merge "Remove underscore from classes RevDel_*"