Rename some missed CM parts