variable naming mixup solved