Terminals: Adopt TM 4.0 API changes
14 files changed