Use 'Manufacturer - ModelName' instead of 'name' for CCU unit names. Fixes #903.