Renamed ntrn and ntst to trn and tst