Some renaming in TT store()