Relabeled a couple of ivars.