Master, Slave: Homogenized names of ivars