Fatter traces for output
Moved names a bit