Update tracing

visual update
renaming