Correction of variable naming not follwoing convention
Further reduction of PMD/Find Bugs issues