variable naming cleanup