Refactor typescript templates to better represent their usage

[Alon-L]

e.x.

type A<T, S> = T & S;

into:

type A<TOptions, TAdditionalOptions> = TOptions & TAdditionalOptions;