Changed naming for controller combination names.