Attempt to fix up cell name changes