I'm not a fan of these changes. The _s_ in `_tsi` and `_tsim` is for "stored". You're breaking the meaning of the sufix.