Changed "hi" to "ti".

The frequency of this combination is much higher.
Also renamed a reflect recent changes in layout name.