Fix for variable naming warning for Java 8+