fix naming and tracing