rename and javadoc factory class name so they are more meaningful.