Removed surviving references to Trace.  Renamed methods.