Gives some private inner classes better names.

 JAVA-1427