Replace Tetris by Trn in type names