#110 preparation + small fix for name_and_type constant in CP