When saving a layout, only cell names that are not alread unique are uniquified
Updated utils to deal with new division between reference and object elements of Cell