Renaming to make sense in association with TS type

* Since we have 2 kinds of TS types, makes more sense for the engine
  associated to the TS to be called after that particular type