diff --git a/doc/cd-opt.xml b/doc/cd-opt.xml
index f7f6059..babadd0 100644
--- a/doc/cd-opt.xml
+++ b/doc/cd-opt.xml
@@ -162,7 +162,7 @@ test suite).
 <dt>-link</dt><dd>A clone of the standard doclet 
 <a href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/javadoc.html#link">-link</a>
 option, allows UMLGraph to generate links from class symbols to their external javadoc
-documentation (image maps are automatically generated in UMLDoc, you'll have to generate them
+documentation (image maps are automatically generated in UMLGraphDoc, you'll have to generate them
 manually with graphviz if using UMLGraph).
 </dd>
 </dl>
diff --git a/doc/cd-umldoc.xml b/doc/cd-umldoc.xml
index e1f1819..f5e0144 100644
--- a/doc/cd-umldoc.xml
+++ b/doc/cd-umldoc.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" ?>
 <!-- $Id$ -->
 <notes>
-UMLDoc is a standard doclet wrapper that allows for mixing togher
+UMLGraphDoc is a standard doclet wrapper that allows for mixing togher
 the standard doclet output (javadoc documentation) along with self-generated
 class diagrams for both package and classes.
 
-UMLDoc can be driven by the sum of parameters that can be specified for
+UMLGraphDoc can be driven by the sum of parameters that can be specified for
 UMLGraph and the standard doclet, each will be passed to the appropriate
 doclet.
 
@@ -19,13 +19,13 @@ The actual content of the diagrams depends on the kind of relations declared on
 class files (with the UMLGraph javadoc annotations) and/or on the kind of automated
 inference that UMLGraph is allowed to use.
 
-UMLGraph javadocs are now generated with UMLDoc with the following ant target:
+UMLGraph javadocs are now generated with UMLGraphDoc with the following ant target:
 
 <fmtcode ext="xml">
 <target name="javadocs" depends="compile">
 	<javadoc sourcepath="${src}" packagenames="gr.spinellis.umlgraph.doclet.*" destdir="${javadoc}" 
 	         private="true">
-		<doclet name="gr.spinellis.umlgraph.doclet.UmlDoc" path="${lib}/UMLGraph.jar">
+		<doclet name="gr.spinellis.umlgraph.doclet.UMLGraphDoc" path="${lib}/UMLGraph.jar">
 			<param name="-inferrel"/>
 			<param name="-inferdep"/>
 			<param name="-hide" value="java.*"/>
diff --git a/src/gr/spinellis/umlgraph/doclet/UmlDoc.java b/src/gr/spinellis/umlgraph/doclet/UmlGraphDoc.java
similarity index 99%
rename from src/gr/spinellis/umlgraph/doclet/UmlDoc.java
rename to src/gr/spinellis/umlgraph/doclet/UmlGraphDoc.java
index 7478783..53ec158 100644
--- a/src/gr/spinellis/umlgraph/doclet/UmlDoc.java
+++ b/src/gr/spinellis/umlgraph/doclet/UmlGraphDoc.java
@@ -25,7 +25,7 @@ import com.sun.tools.doclets.standard.Standard;
  * @depend - - - WrappedClassDoc
  * @depend - - - WrappedRootDoc
  */
-public class UmlDoc {
+public class UmlGraphDoc {
     /**
      * Option check, forwards options to the standard doclet, if that one refuses them,
      * they are sent to UmlGraph
diff --git a/src/org/umlgraph/doclet/UmlDoc.java b/src/org/umlgraph/doclet/UmlGraphDoc.java
similarity index 99%
rename from src/org/umlgraph/doclet/UmlDoc.java
rename to src/org/umlgraph/doclet/UmlGraphDoc.java
index 7478783..53ec158 100644
--- a/src/org/umlgraph/doclet/UmlDoc.java
+++ b/src/org/umlgraph/doclet/UmlGraphDoc.java
@@ -25,7 +25,7 @@ import com.sun.tools.doclets.standard.Standard;
  * @depend - - - WrappedClassDoc
  * @depend - - - WrappedRootDoc
  */
-public class UmlDoc {
+public class UmlGraphDoc {
     /**
      * Option check, forwards options to the standard doclet, if that one refuses them,
      * they are sent to UmlGraph