Issue #248 Renaming some variables