Change some packages to CM's