variable names refactoring to comply with Java naming conventions