Refactor some TimesSquare -> HSTimesSquare