#15 Rename Trace dependency to TraceSource