youll also need to replace the </action> with </equip> for those specific lines if they wernt self closed. its best you manually replace those.
drex with RC7 both will work. apparently SE ninja'd it in allowing both to work some patch and noone noticed. Sure as hell use to not work with both. (short and full)
I added long name support to RC7 too.