Replace remaining "ucell" usages with "cell"