fix naming of variables/parameters/members