Adopt variable naming