Switch to CdIcc everywhere

Signed-off-by: Alexey Galakhov <agalakhov@gmail.com>