TS HS V1.1: Handles cube naming