Consistently label defs and vars