fix naming of variables/parameters/members
fix some checkstyle warnings