3.0 - Fix short echo CS in bake class templates