More cx into _ or mb renames