Fix poor variable naming