diff --git a/proposal/myrmidon/src/java/org/apache/antlib/archive/BUnzip2.java b/proposal/myrmidon/src/java/org/apache/antlib/archive/BUnzip2.java
index 898cec3e1..414f48fe1 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/archive/BUnzip2.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/archive/BUnzip2.java
@@ -17,7 +17,7 @@ import org.apache.myrmidon.api.TaskException;
  * used to compress non-compressed archives such as TAR files.
  *
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
- * @ant:task name="bunzip2"
+ * @ant.task name="bunzip2"
  */
 public class BUnzip2
     extends Unpack
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java b/proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java
index b255409ed..712ce1ef9 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java
@@ -18,7 +18,7 @@ import org.apache.myrmidon.api.TaskException;
  *
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:task name="bzip2"
+ * @ant.task name="bzip2"
  */
 public class BZip2
     extends Pack
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/archive/GUnzip.java b/proposal/myrmidon/src/java/org/apache/antlib/archive/GUnzip.java
index 324d6aaa7..3388836ef 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/archive/GUnzip.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/archive/GUnzip.java
@@ -18,7 +18,7 @@ import org.apache.myrmidon.api.TaskException;
  *
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
- * @ant:task name="gunzip"
+ * @ant.task name="gunzip"
  */
 public class GUnzip
     extends Unpack
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/archive/GZip.java b/proposal/myrmidon/src/java/org/apache/antlib/archive/GZip.java
index 1a7325d20..055098f0e 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/archive/GZip.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/archive/GZip.java
@@ -20,7 +20,7 @@ import org.apache.myrmidon.api.TaskException;
  * @author Jon S. Stevens <a href="mailto:jon@clearink.com">jon@clearink.com</a>
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:task name="gzip"
+ * @ant.task name="gzip"
  */
 public class GZip
     extends Pack
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/build/BuildNumber.java b/proposal/myrmidon/src/java/org/apache/antlib/build/BuildNumber.java
index 7b932e8e2..774517b6a 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/build/BuildNumber.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/build/BuildNumber.java
@@ -28,7 +28,7 @@ import org.apache.myrmidon.api.TaskException;
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
- * @ant:task name="build-number"
+ * @ant.task name="build-number"
  */
 public class BuildNumber
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java b/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java
index b58026b54..08c3885e3 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java
@@ -30,7 +30,7 @@ import org.apache.tools.todo.types.ScannerUtil;
  * This task can be used to create checksums for files. It can also be used to
  * verify checksums.
  *
- * @ant:task name="checksum"
+ * @ant.task name="checksum"
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  * @version $Revision$ $Date$
  */
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java b/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java
index b69d76c06..395bf3d36 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java
@@ -18,7 +18,7 @@ import org.apache.tools.todo.types.Commandline;
 /**
  * Task as a layer on top of patch. Patch applies a diff file to an original.
  *
- * @ant:task name="patchx"
+ * @ant.task name="patchx"
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java b/proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java
index c85e8f05a..5c995be98 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java
@@ -15,7 +15,7 @@ import org.apache.myrmidon.api.TaskException;
 /**
  * A task to sleep for a period of time
  *
- * @ant:task name="sleep"
+ * @ant.task name="sleep"
  * @author steve_l@iseran.com steve loughran
  * @version $Revision$ $Date$
  */
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/ConditionTask.java b/proposal/myrmidon/src/java/org/apache/antlib/core/ConditionTask.java
index 16032cda5..4d6aac283 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/ConditionTask.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/ConditionTask.java
@@ -24,7 +24,7 @@ import org.apache.myrmidon.framework.conditions.Condition;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @version $Revision$
  *
- * @ant:task name="condition"
+ * @ant.task name="condition"
  */
 public class ConditionTask
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/Fail.java b/proposal/myrmidon/src/java/org/apache/antlib/core/Fail.java
index e5783ed39..407a7834e 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/Fail.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/Fail.java
@@ -15,7 +15,7 @@ import org.apache.myrmidon.api.TaskException;
  * Useful for forcing a build to fail on a certain condition.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:task name="fail"
+ * @ant.task name="fail"
  */
 public class Fail
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java b/proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java
index ce92d38fb..518d73381 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java
@@ -23,7 +23,7 @@ import org.apache.myrmidon.framework.conditions.NotCondition;
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
- * @ant:task name="if"
+ * @ant.task name="if"
  */
 public class IfTask
     extends AbstractContainerTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java b/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java
index cbcd1ff96..c59cbfd7d 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java
@@ -21,7 +21,7 @@ import org.apache.myrmidon.api.TaskException;
  * This task loads properties from a property file and places them in the context.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:task name="load-properties"
+ * @ant.task name="load-properties"
  */
 public class LoadProperties
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java b/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java
index d272f53c7..08acd5cc4 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java
@@ -15,7 +15,7 @@ import org.apache.myrmidon.framework.LogLevel;
  * This is a task used to log messages in the build file.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:task name="log"
+ * @ant.task name="log"
  */
 public class Log
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java b/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java
index fb7d641f6..703d53d52 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java
@@ -20,7 +20,7 @@ import org.apache.myrmidon.framework.DataType;
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
- * @ant:task name="property"
+ * @ant.task name="property"
  */
 public class Property
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/PropertyDump.java b/proposal/myrmidon/src/java/org/apache/antlib/core/PropertyDump.java
index b943a9f6d..5b1f29d18 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/PropertyDump.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/PropertyDump.java
@@ -19,7 +19,7 @@ import org.apache.myrmidon.api.AbstractTask;
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @author <a href="mailto:jimcook@visualxs.com">Jim Cook</a>
  * @version $Revision$ $Date$
- * @ant:task name="property-dump"
+ * @ant.task name="property-dump"
  */
 public class PropertyDump
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/TryCatchTask.java b/proposal/myrmidon/src/java/org/apache/antlib/core/TryCatchTask.java
index 4e915d811..c6e746776 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/TryCatchTask.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/TryCatchTask.java
@@ -20,7 +20,7 @@ import org.apache.myrmidon.framework.TaskList;
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
- * @ant:task name="try-catch"
+ * @ant.task name="try-catch"
  */
 public final class TryCatchTask
     extends AbstractContainerTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java
index 1c1309029..f6339098d 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java
@@ -22,7 +22,7 @@ import org.apache.myrmidon.api.TaskException;
  *
  * @author <a href="jeff@custommonkey.org">Jeff Martin</a>
  * @version $Revision$ $Date$
- * @ant:task name="cvs-pass"
+ * @ant.task name="cvs-pass"
  */
 public class CVSPass
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java
index 6ac03eb01..424368b1f 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java
@@ -23,7 +23,7 @@ import org.apache.tools.todo.util.FileUtils;
  * @author <a href="mailto:stefano@apache.org">stefano@apache.org</a>
  * @author <a href="mailto:wwerner@picturesafe.de">Wolfgang Werner</a>
  * @version $Revision$ $Date$
- * @ant:task name="cvs"
+ * @ant.task name="cvs"
  */
 public class Cvs
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java b/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java
index 6c1047830..8a452b598 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java
@@ -28,7 +28,7 @@ import org.apache.tools.todo.util.mappers.IdentityMapper;
 /**
  * This is a task used to copy files.
  *
- * @ant:task name="copy"
+ * @ant.task name="copy"
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @author <a href="mailto:glennm@ca.ibm.com">Glenn McAllister</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java b/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java
index 40040b6d8..19fb65a28 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java
@@ -20,7 +20,7 @@ import org.apache.tools.todo.types.ScannerUtil;
 /**
  * Deletes a file or directory, or set of files defined by a fileset.
  *
- * @ant:task name="delete"
+ * @ant.task name="delete"
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  * @author <a href="mailto:tad1@cornell.edu">Tom Dimock</a>
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/FilteredCopyTask.java b/proposal/myrmidon/src/java/org/apache/antlib/file/FilteredCopyTask.java
index b5a7ccd89..912bc9cda 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/file/FilteredCopyTask.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/file/FilteredCopyTask.java
@@ -28,7 +28,7 @@ import org.apache.myrmidon.framework.filters.LineFilterSet;
  * A task used to copy files and simultaneously apply a
  * filter on said files.
  *
- * @ant:task name="filtered-copy"
+ * @ant.task name="filtered-copy"
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
  */
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/ListPathTask.java b/proposal/myrmidon/src/java/org/apache/antlib/file/ListPathTask.java
index 7e57bfc48..b9cdc5170 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/file/ListPathTask.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/file/ListPathTask.java
@@ -18,7 +18,7 @@ import org.apache.myrmidon.framework.file.Path;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:task name="list-path"
+ * @ant.task name="list-path"
  */
 public class ListPathTask
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java b/proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java
index 32b3b73d3..6b14be31d 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java
@@ -16,7 +16,7 @@ import org.apache.myrmidon.api.TaskException;
 /**
  * Creates specified directory.
  *
- * @ant:task name="mkdir"
+ * @ant.task name="mkdir"
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @author duncan@x180.com
  * @version $Revision$ $Date$
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/MoveTask.java b/proposal/myrmidon/src/java/org/apache/antlib/file/MoveTask.java
index 08fcfb748..1296fa6a1 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/file/MoveTask.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/file/MoveTask.java
@@ -14,7 +14,7 @@ import org.apache.avalon.excalibur.io.FileUtil;
 /**
  * A task used to move files.
  *
- * @ant:task name="move"
+ * @ant.task name="move"
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
  */
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java b/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java
index f86455a0f..09b43cd31 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java
@@ -27,7 +27,7 @@ import org.apache.tools.todo.types.ScannerUtil;
  *
  * If the file to touch doesn't exist, an empty one is created. </p>
  *
- * @ant:task name="touch"
+ * @ant.task name="touch"
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @author <a href="mailto:mj@servidium.com">Michael J. Sikorsky</a>
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/java/JavaTask.java b/proposal/myrmidon/src/java/org/apache/antlib/java/JavaTask.java
index 9c63bdedd..0df68305d 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/java/JavaTask.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/java/JavaTask.java
@@ -23,7 +23,7 @@ import org.apache.myrmidon.framework.file.Path;
  *      stefano@apache.org</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:task name="java"
+ * @ant.task name="java"
  */
 public class JavaTask
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java b/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java
index e1c9c1822..39e83677b 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java
@@ -27,7 +27,7 @@ import org.apache.tools.todo.types.EnvironmentVariable;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @author <a href="mailto:mariusz@rakiura.org">Mariusz Nowostawski</a>
  * @author <a href="mailto:thomas.haas@softwired-inc.com">Thomas Haas</a>
- * @ant:task name="exec"
+ * @ant.task name="exec"
  */
 public class Exec
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java b/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java
index 2cd75d42b..c32d52f80 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java
@@ -22,7 +22,7 @@ import org.apache.myrmidon.api.TaskException;
  * prefix.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:task name="load-environment"
+ * @ant.task name="load-environment"
  */
 public class LoadEnvironment
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/runtime/ConverterDef.java b/proposal/myrmidon/src/java/org/apache/antlib/runtime/ConverterDef.java
index b58eb2d66..f3a95422c 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/runtime/ConverterDef.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/runtime/ConverterDef.java
@@ -15,7 +15,7 @@ import org.apache.myrmidon.interfaces.deployer.TypeDefinition;
  * Task to define a converter.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:task name="converter-def"
+ * @ant.task name="converter-def"
  */
 public class ConverterDef
     extends AbstractTypeDef
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java b/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java
index 4275079a3..f71434183 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java
@@ -21,7 +21,7 @@ import org.apache.myrmidon.interfaces.aspect.AspectManager;
  * Task that definesMethod to register a single converter.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:task name="facility"
+ * @ant.task name="facility"
  */
 public class Facility
     extends AbstractContainerTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/runtime/Import.java b/proposal/myrmidon/src/java/org/apache/antlib/runtime/Import.java
index 0d2634775..ae597ce20 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/runtime/Import.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/runtime/Import.java
@@ -20,7 +20,7 @@ import org.apache.myrmidon.interfaces.deployer.TypeDeployer;
  * Task to import a tasklib.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:task name="import"
+ * @ant.task name="import"
  */
 public class Import
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/runtime/TypeDef.java b/proposal/myrmidon/src/java/org/apache/antlib/runtime/TypeDef.java
index b65fdfaa2..e06a79af3 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/runtime/TypeDef.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/runtime/TypeDef.java
@@ -14,7 +14,7 @@ import org.apache.myrmidon.interfaces.deployer.TypeDefinition;
  * Task to define a type.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:task name="type-def"
+ * @ant.task name="type-def"
  */
 public class TypeDef
     extends AbstractTypeDef
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java b/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java
index 8fce2639b..b3139ce84 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java
@@ -16,7 +16,7 @@ import org.apache.tools.todo.types.Commandline;
  * Generates a key.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:task name="generate-key"
+ * @ant.task name="generate-key"
  */
 public class GenerateKey
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java b/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java
index 9d82022f4..c1a5119f6 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java
@@ -26,7 +26,7 @@ import org.apache.tools.todo.types.ScannerUtil;
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @author <a href="mailto:nick@ox.compsoc.net">Nick Fortescue</a>
- * @ant:task name="sign-jar"
+ * @ant.task name="sign-jar"
  */
 public class SignJar
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/selftest/ExtensionsTest.java b/proposal/myrmidon/src/java/org/apache/antlib/selftest/ExtensionsTest.java
index d23efbc53..b3738f31d 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/selftest/ExtensionsTest.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/selftest/ExtensionsTest.java
@@ -15,7 +15,7 @@ import org.apache.myrmidon.api.TaskException;
  * This is to test whether extension is loaded.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:task name="extensions-test"
+ * @ant.task name="extensions-test"
  */
 public class ExtensionsTest
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java b/proposal/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java
index 688f701c3..0484fe8ff 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java
@@ -14,7 +14,7 @@ import org.apache.myrmidon.api.TaskException;
  * Test conversion of all the primitive types.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:task name="prim-test"
+ * @ant.task name="prim-test"
  */
 public class PrimitiveTypesTest
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java b/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java
index 04a39abea..f18eedc6c 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java
@@ -26,7 +26,7 @@ import org.apache.myrmidon.interfaces.workspace.Workspace;
  * plans for the future: - use the midi api to define sounds (or drum beat etc)
  * in xml and have Ant play them back
  *
- * @ant:task name="sound-listener"
+ * @ant.task name="sound-listener"
  * @author Nick Pellow
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$, $Date$
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java
index fe86c2a4a..a6c8d946a 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java
@@ -23,7 +23,7 @@ import org.apache.myrmidon.api.TaskException;
  *
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  *
- * @ant:task name="v-copy"
+ * @ant.task name="v-copy"
  */
 public class CopyFilesTask
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFileSetTask.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFileSetTask.java
index 038c61bc1..cb607e085 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFileSetTask.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFileSetTask.java
@@ -18,7 +18,7 @@ import org.apache.myrmidon.api.TaskException;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:task name="v-list-fileset"
+ * @ant.task name="v-list-fileset"
  */
 public class ListFileSetTask
     extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java
index fe381bfd3..229a9220f 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java
@@ -17,7 +17,7 @@ import org.apache.myrmidon.api.TaskException;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:task name="v-list-path"
+ * @ant.task name="v-list-path"
  */
 public class ListFilesTask
     extends AbstractTask