Change ambiguous variable naming