CP core has been renamed common.