Variable name change and javadocs.