Make mvn javadoc:javadoc pass.
Rename some variable.
Remove some idea warnings (make some files green).