Renaming and getting rid of some trace steps in OT trace setter