More changes, mainly find and replaces in IRDE files