Fixing bad variable naming choices