Removed renaming of all record types and reverted back to OPR only