Refactor the class name with javadoc included