Fix minor inconsistencies in variable naming. And remove erroneous commit