Tweak Cell.build naming