Be pickier about variable naming