Fix all Tpa and Tpahere