Remove CR
Rename inject -> diag_inject