diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/ClassAvailableCondition.java b/proposal/myrmidon/src/java/org/apache/antlib/core/ClassAvailableCondition.java
index fcf4f3d6d..e3e21de2e 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/ClassAvailableCondition.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/ClassAvailableCondition.java
@@ -19,7 +19,7 @@ import org.apache.myrmidon.framework.conditions.Condition;
  *      stefano@apache.org</a>
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  *
- * @ant:type type="condition" name="class-available"
+ * @ant.type type="condition" name="class-available"
  */
 public class ClassAvailableCondition
     extends AbstractAvailableCondition
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/ExtFileNameMapper.java b/proposal/myrmidon/src/java/org/apache/antlib/core/ExtFileNameMapper.java
index 896ae9d9e..51092c289 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/ExtFileNameMapper.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/ExtFileNameMapper.java
@@ -15,7 +15,7 @@ import org.apache.myrmidon.framework.FileNameMapper;
 /**
  * Maps file extensions.
  *
- * @ant:type type="mapper" name="map-extension"
+ * @ant.type type="mapper" name="map-extension"
  */
 public class ExtFileNameMapper
     implements FileNameMapper
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/FileTokenSet.java b/proposal/myrmidon/src/java/org/apache/antlib/core/FileTokenSet.java
index d801c2c8e..31a2140b8 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/FileTokenSet.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/FileTokenSet.java
@@ -25,7 +25,7 @@ import org.apache.myrmidon.framework.filters.TokenSet;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="token-set" name="tokens-file"
+ * @ant.type type="token-set" name="tokens-file"
  */
 public class FileTokenSet
     implements TokenSet
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/FlatFileNameMapper.java b/proposal/myrmidon/src/java/org/apache/antlib/core/FlatFileNameMapper.java
index 8a8bf57de..6ce758615 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/FlatFileNameMapper.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/FlatFileNameMapper.java
@@ -18,7 +18,7 @@ import org.apache.myrmidon.framework.FileNameMapper;
  *
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:type type="mapper" name="flatten"
+ * @ant.type type="mapper" name="flatten"
  */
 public class FlatFileNameMapper
     extends PrefixFileNameMapper
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/ObjectToStringConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/ObjectToStringConverter.java
index 05d53c8e2..4af5ef476 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/ObjectToStringConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/ObjectToStringConverter.java
@@ -17,7 +17,7 @@ import org.apache.aut.converter.ConverterException;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:converter source="java.lang.Object" destination="java.lang.String"
+ * @ant.converter source="java.lang.Object" destination="java.lang.String"
  */
 public class ObjectToStringConverter
     extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/OsCondition.java b/proposal/myrmidon/src/java/org/apache/antlib/core/OsCondition.java
index bf8cdbd34..d32aceafe 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/OsCondition.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/OsCondition.java
@@ -18,7 +18,7 @@ import org.apache.myrmidon.framework.conditions.Condition;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @version $Revision$
  *
- * @ant:type type="condition" name="os"
+ * @ant.type type="condition" name="os"
  */
 public class OsCondition
     implements Condition
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/PrefixFileNameMapper.java b/proposal/myrmidon/src/java/org/apache/antlib/core/PrefixFileNameMapper.java
index 02d63ab1e..6a0ba701c 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/PrefixFileNameMapper.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/PrefixFileNameMapper.java
@@ -17,7 +17,7 @@ import org.apache.myrmidon.framework.FileNameMapper;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="mapper" name="prefix"
+ * @ant.type type="mapper" name="prefix"
  */
 public class PrefixFileNameMapper
     implements FileNameMapper
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/PropertyTokenSet.java b/proposal/myrmidon/src/java/org/apache/antlib/core/PropertyTokenSet.java
index 24618ea94..03d902941 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/PropertyTokenSet.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/PropertyTokenSet.java
@@ -17,7 +17,7 @@ import org.apache.myrmidon.framework.filters.TokenSet;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="token-set" name="properties"
+ * @ant.type type="token-set" name="properties"
  */
 public class PropertyTokenSet
     implements TokenSet
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/ResourceAvailableCondition.java b/proposal/myrmidon/src/java/org/apache/antlib/core/ResourceAvailableCondition.java
index a704c933b..c5931afca 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/ResourceAvailableCondition.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/ResourceAvailableCondition.java
@@ -21,7 +21,7 @@ import org.apache.myrmidon.framework.conditions.Condition;
  *      stefano@apache.org</a>
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  *
- * @ant:type type="condition" name="resource-available"
+ * @ant.type type="condition" name="resource-available"
  */
 public class ResourceAvailableCondition
     extends AbstractAvailableCondition
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/SingletonTokenSet.java b/proposal/myrmidon/src/java/org/apache/antlib/core/SingletonTokenSet.java
index 62fc6d604..37a8aabd2 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/SingletonTokenSet.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/SingletonTokenSet.java
@@ -17,7 +17,7 @@ import org.apache.myrmidon.framework.filters.TokenSet;
  * @author Michael McCallum
  * @created 14 March 2001
  *
- * @ant:type type="token-set" name="token"
+ * @ant.type type="token-set" name="token"
  */
 public class SingletonTokenSet
     implements TokenSet
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java
index d0b2010ac..cc677e71c 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java
@@ -16,7 +16,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
  * String to boolean converter
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:converter source="java.lang.String" destination="java.lang.Boolean"
+ * @ant.converter source="java.lang.String" destination="java.lang.Boolean"
  */
 public class StringToBooleanConverter
     extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java
index 76dfe6fa7..3afc659bd 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java
@@ -16,7 +16,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
  * String to byte converter
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:converter source="java.lang.String" destination="java.lang.Byte"
+ * @ant.converter source="java.lang.String" destination="java.lang.Byte"
  */
 public class StringToByteConverter
     extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java
index 0009cce46..4e2cc9e32 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java
@@ -16,7 +16,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
  * String to class converter
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:converter source="java.lang.String" destination="java.lang.Class"
+ * @ant.converter source="java.lang.String" destination="java.lang.Class"
  */
 public class StringToClassConverter
     extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java
index fb8f4c412..e2138fbf3 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java
@@ -16,7 +16,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
  * String to double converter
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:converter source="java.lang.String" destination="java.lang.Double"
+ * @ant.converter source="java.lang.String" destination="java.lang.Double"
  */
 public class StringToDoubleConverter
     extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java
index 3179f4c56..8fa33b477 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java
@@ -19,7 +19,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
  * String to Enum converter
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:converter source="java.lang.String" destination="org.apache.avalon.framework.Enum"
+ * @ant.converter source="java.lang.String" destination="org.apache.avalon.framework.Enum"
  */
 public class StringToEnumConverter
     implements Converter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java
index edda6dd02..4643d07f9 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java
@@ -19,7 +19,7 @@ import org.apache.myrmidon.api.TaskException;
  * String to file converter
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:converter source="java.lang.String" destination="java.io.File"
+ * @ant.converter source="java.lang.String" destination="java.io.File"
  */
 public class StringToFileConverter
     extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java
index 3e04372c0..ab96e70e7 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java
@@ -16,7 +16,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
  * String to float converter
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:converter source="java.lang.String" destination="java.lang.Float"
+ * @ant.converter source="java.lang.String" destination="java.lang.Float"
  */
 public class StringToFloatConverter
     extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java
index 81e8305df..257e4a1f8 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java
@@ -16,7 +16,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
  * String to integer converter.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:converter source="java.lang.String" destination="java.lang.Integer"
+ * @ant.converter source="java.lang.String" destination="java.lang.Integer"
  */
 public class StringToIntegerConverter
     extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java
index 839dd9e90..7219387f6 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java
@@ -16,7 +16,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
  * String to long converter
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:converter source="java.lang.String" destination="java.lang.Long"
+ * @ant.converter source="java.lang.String" destination="java.lang.Long"
  */
 public class StringToLongConverter
     extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java
index b623d3033..4267b7c63 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java
@@ -16,7 +16,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
  * String to short converter
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:converter source="java.lang.String" destination="java.lang.Short"
+ * @ant.converter source="java.lang.String" destination="java.lang.Short"
  */
 public class StringToShortConverter
     extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java
index 777d72d6a..b46a86a3e 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java
@@ -18,7 +18,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
  * String to url converter
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:converter source="java.lang.String" destination="java.net.URL"
+ * @ant.converter source="java.lang.String" destination="java.net.URL"
  */
 public class StringToURLConverter
     extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileList.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileList.java
index d8d288a38..731c7cbd2 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileList.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileList.java
@@ -19,8 +19,8 @@ import org.apache.myrmidon.api.TaskException;
  *
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  *
- * @ant:data-type name="v-path"
- * @ant:type type="v-path" name="v-path"
+ * @ant.data-type name="v-path"
+ * @ant.type type="v-path" name="v-path"
  */
 public class DefaultFileList implements FileList
 {
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java
index 78f94e72c..a12597637 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java
@@ -24,8 +24,8 @@ import org.apache.myrmidon.api.TaskException;
  *
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  *
- * @ant:data-type name="v-fileset"
- * @ant:type type="v-fileset" name="v-fileset"
+ * @ant.data-type name="v-fileset"
+ * @ant.type type="v-fileset" name="v-fileset"
  */
 public class DefaultFileSet
     implements FileSet
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/FileSetToFileListConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/FileSetToFileListConverter.java
index afed5d5b1..ed753fba5 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/FileSetToFileListConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/FileSetToFileListConverter.java
@@ -16,7 +16,7 @@ import org.apache.aut.converter.ConverterException;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:converter source="org.apache.antlib.vfile.FileSet"
+ * @ant.converter source="org.apache.antlib.vfile.FileSet"
  *                destination="org.apache.antlib.vfile.FileList"
  */
 public class FileSetToFileListConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java
index 7348289ec..9f002c1ff 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java
@@ -20,8 +20,8 @@ import org.apache.myrmidon.api.TaskException;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:data-type name="filtered-path"
- * @ant:type type="v-path" name="filtered-path"
+ * @ant.data-type name="filtered-path"
+ * @ant.type type="v-path" name="filtered-path"
  */
 public class FilteredFileList
     implements FileList
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/FlatFileSet.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/FlatFileSet.java
index f190c950c..bd9f03911 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/FlatFileSet.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/FlatFileSet.java
@@ -17,8 +17,8 @@ import org.apache.myrmidon.api.TaskException;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:data-type name="flat-fileset"
- * @ant:type type="v-fileset" name="flat-fileset"
+ * @ant.data-type name="flat-fileset"
+ * @ant.type type="v-fileset" name="flat-fileset"
  */
 public class FlatFileSet
     implements FileSet
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/MappedFileSet.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/MappedFileSet.java
index 3ae290456..138d3b38d 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/MappedFileSet.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/MappedFileSet.java
@@ -19,7 +19,7 @@ import org.apache.myrmidon.framework.ChainFileNameMapper;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:data-type name="mapped-fileset"
+ * @ant.data-type name="mapped-fileset"
  */
 public class MappedFileSet
     implements FileSet
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java
index 1044cc2a6..613444434 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java
@@ -19,7 +19,7 @@ import org.apache.myrmidon.api.TaskContext;
  * Converts a String to a {@link FileObject}
  *
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
- * @ant:converter source="java.lang.String" destination="org.apache.aut.vfs.FileObject"
+ * @ant.converter source="java.lang.String" destination="org.apache.aut.vfs.FileObject"
  */
 public class StringToFileObjectConverter
     extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java
index 6dba6c235..0e67b9c1e 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java
@@ -19,7 +19,7 @@ import org.apache.myrmidon.api.TaskException;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="v-file-selector" name="and"
+ * @ant.type type="v-file-selector" name="and"
  */
 public class AndFileSelector
     implements FileSelector
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/BaseNameFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/BaseNameFileSelector.java
index 0b62bb9f3..f656433b1 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/BaseNameFileSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/BaseNameFileSelector.java
@@ -15,7 +15,7 @@ import org.apache.aut.vfs.FileObject;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="v-file-selector" name="basename"
+ * @ant.type type="v-file-selector" name="basename"
  */
 public class BaseNameFileSelector
     extends AbstractNameFileSelector
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ConditionSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ConditionSelector.java
index ea0326b31..31007c51f 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ConditionSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ConditionSelector.java
@@ -19,7 +19,7 @@ import org.apache.myrmidon.framework.conditions.Condition;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="v-file-selector" name="condition"
+ * @ant.type type="v-file-selector" name="condition"
  */
 public class ConditionSelector
     implements FileSelector
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.java
index 2faf66aa5..ef7d0a15e 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.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:type type="v-file-selector" name="exists"
+ * @ant.type type="v-file-selector" name="exists"
  */
 public class ExistenceFileSelector
     implements FileSelector
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java
index 358de4abf..2790e9af7 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java
@@ -20,7 +20,7 @@ import org.apache.myrmidon.framework.conditions.Condition;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="condition" name="file-test"
+ * @ant.type type="condition" name="file-test"
  */
 public class FileTestCondition
     implements Condition
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java
index f169f9367..da96a721b 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java
@@ -19,7 +19,7 @@ import org.apache.myrmidon.api.TaskException;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="v-file-selector" name="is-empty-folder"
+ * @ant.type type="v-file-selector" name="is-empty-folder"
  */
 public class IsEmptyFolderSelector
     implements FileSelector
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java
index 3ce89ce2d..6f19a51b8 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java
@@ -19,7 +19,7 @@ import org.apache.myrmidon.api.TaskException;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="v-file-selector" name="is-file"
+ * @ant.type type="v-file-selector" name="is-file"
  */
 public class IsFileSelector
     implements FileSelector
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java
index fdded32dd..419ed4b61 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java
@@ -19,7 +19,7 @@ import org.apache.myrmidon.api.TaskException;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="v-file-selector" name="is-folder"
+ * @ant.type type="v-file-selector" name="is-folder"
  */
 public class IsFolderSelector
     implements FileSelector
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java
index 3d3d35154..a5b8b9c94 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.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:type type="v-file-selector" name="name"
+ * @ant.type type="v-file-selector" name="name"
  */
 public class NameFileSelector
     extends AbstractNameFileSelector
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java
index bd8e11e2f..b0ef60acf 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java
@@ -19,7 +19,7 @@ import org.apache.myrmidon.api.TaskException;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="v-file-selector" name="not"
+ * @ant.type type="v-file-selector" name="not"
  */
 public class NotFileSelector
     implements FileSelector
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java
index 5348eb487..7517196d3 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java
@@ -19,7 +19,7 @@ import org.apache.myrmidon.api.TaskException;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="v-file-selector" name="or"
+ * @ant.type type="v-file-selector" name="or"
  */
 public class OrFileSelector
     implements FileSelector
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/UrlFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/UrlFileSelector.java
index ccd900b6a..95338fb4f 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/UrlFileSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/UrlFileSelector.java
@@ -15,7 +15,7 @@ import org.apache.aut.vfs.FileObject;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="v-file-selector" name="url"
+ * @ant.type type="v-file-selector" name="url"
  */
 public class UrlFileSelector
     extends AbstractNameFileSelector
diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystemProvider.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystemProvider.java
index 4684abec2..0369c6d5f 100644
--- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystemProvider.java
+++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystemProvider.java
@@ -20,7 +20,7 @@ import org.apache.aut.vfs.provider.ParsedUri;
  *
  * @author Adam Murdoch
  *
- * @ant:type type="file-system" name="ftp"
+ * @ant.type type="file-system" name="ftp"
  */
 public class FtpFileSystemProvider extends AbstractFileSystemProvider
 {
diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileSystemProvider.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileSystemProvider.java
index ba62eec70..a6b60bfec 100644
--- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileSystemProvider.java
+++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileSystemProvider.java
@@ -21,7 +21,7 @@ import org.apache.aut.vfs.provider.ParsedUri;
  *
  * @author Adam Murdoch
  *
- * @ant:type type="file-system" name="smb"
+ * @ant.type type="file-system" name="smb"
  */
 public class SmbFileSystemProvider extends AbstractFileSystemProvider implements FileSystemProvider
 {
diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystemProvider.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystemProvider.java
index f1ab31d82..6c3c91a1d 100644
--- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystemProvider.java
+++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystemProvider.java
@@ -23,7 +23,7 @@ import org.apache.aut.vfs.provider.ParsedUri;
  *
  * @author Adam Murdoch
  *
- * @ant:type type="file-system" name="zip"
+ * @ant.type type="file-system" name="zip"
  */
 public class ZipFileSystemProvider
     extends AbstractFileSystemProvider
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/aspects/NoopAspectHandler.java b/proposal/myrmidon/src/java/org/apache/myrmidon/aspects/NoopAspectHandler.java
index 9eee56b4a..b65301728 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/aspects/NoopAspectHandler.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/aspects/NoopAspectHandler.java
@@ -12,7 +12,7 @@ package org.apache.myrmidon.aspects;
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
- * @ant:type type="aspect" name="noop"
+ * @ant.type type="aspect" name="noop"
  */
 public class NoopAspectHandler
     extends AbstractAspectHandler
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java
index 1fb04a148..ed38af6f0 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java
@@ -29,7 +29,7 @@ import org.xml.sax.XMLReader;
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
- * @ant:type type="project-builder" name="ati"
+ * @ant.type type="project-builder" name="ati"
  */
 public class ATIProjectBuilder
     extends DefaultProjectBuilder
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
index 3c34f2266..5938b69e8 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
@@ -36,7 +36,7 @@ import org.xml.sax.XMLReader;
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="project-builder" name="ant"
+ * @ant.type type="project-builder" name="ant"
  */
 public class DefaultProjectBuilder
     extends AbstractLogEnabled
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/TransformingProjectBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/TransformingProjectBuilder.java
index d65bd9dd4..64fe83b26 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/TransformingProjectBuilder.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/TransformingProjectBuilder.java
@@ -27,7 +27,7 @@ import org.apache.myrmidon.interfaces.builder.ProjectException;
  * @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="project-builder" name="xml"
+ * @ant.type type="project-builder" name="xml"
  */
 public class TransformingProjectBuilder
     extends DefaultProjectBuilder
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java
index 77c73524b..880c246a6 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java
@@ -30,7 +30,7 @@ import org.apache.myrmidon.interfaces.configurer.Configurer;
  * Class used to configure tasks.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @ant:type type="configurer" name="classic"
+ * @ant.type type="configurer" name="classic"
  */
 public class ClassicConfigurer
     extends AbstractLogEnabled
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
index bde7ca0b2..8b0109d85 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
@@ -34,7 +34,7 @@ import org.apache.myrmidon.interfaces.type.TypeManager;
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
- * @ant:type type="configurer" name="default"
+ * @ant.type type="configurer" name="default"
  */
 public class DefaultConfigurer
     extends AbstractLogEnabled
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/ChainFileNameMapper.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/ChainFileNameMapper.java
index 9bb8937b9..29846a916 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/ChainFileNameMapper.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/ChainFileNameMapper.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:type type="mapper" name="chain"
+ * @ant.type type="mapper" name="chain"
  */
 public class ChainFileNameMapper
     implements FileNameMapper
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/FileSet.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/FileSet.java
index 082a19b32..eb05b909c 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/FileSet.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/FileSet.java
@@ -16,7 +16,7 @@ import java.io.File;
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
  *
- * @ant:data-type name="fileset"
+ * @ant.data-type name="fileset"
  */
 public class FileSet
     extends AbstractFileSet
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
index b46b30191..c536935ba 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
@@ -20,7 +20,7 @@ import org.apache.myrmidon.framework.conditions.NotCondition;
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
- * @ant:data-type name="pattern"
+ * @ant.data-type name="pattern"
  */
 public class Pattern
     implements DataType
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java
index 794bd3773..6fbdf5dc4 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java
@@ -20,7 +20,7 @@ import org.apache.myrmidon.api.TaskException;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @version $Revision$
  *
- * @ant:type type="condition" name="and"
+ * @ant.type type="condition" name="and"
  */
 public class AndCondition
     implements Condition
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java
index ed20d4d82..afbe23566 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java
@@ -21,7 +21,7 @@ import org.apache.myrmidon.api.TaskException;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="condition" name="is-set"
+ * @ant.type type="condition" name="is-set"
  */
 public class IsSetCondition
     implements Condition
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java
index 732e99ad4..45abef4f3 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java
@@ -17,7 +17,7 @@ import org.apache.myrmidon.api.TaskException;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @version $Revision$
  *
- * @ant:type type="condition" name="not"
+ * @ant.type type="condition" name="not"
  */
 public class NotCondition
     implements Condition
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java
index 494ff2e6f..2e4683ba9 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java
@@ -20,7 +20,7 @@ import org.apache.myrmidon.api.TaskException;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @version $Revision$
  *
- * @ant:type type="condition" name="or"
+ * @ant.type type="condition" name="or"
  */
 public class OrCondition
     implements Condition
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileListToStringConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileListToStringConverter.java
index 4ad7d56b7..80bcc1566 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileListToStringConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileListToStringConverter.java
@@ -20,7 +20,7 @@ import org.apache.tools.todo.types.PathUtil;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:converter source="org.apache.myrmidon.framework.file.FileList" destination="java.lang.String"
+ * @ant.converter source="org.apache.myrmidon.framework.file.FileList" destination="java.lang.String"
  */
 public class FileListToStringConverter
     extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java
index ffd7fe919..28cc67cee 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java
@@ -50,7 +50,7 @@ import org.apache.tools.todo.types.ScannerUtil;
  * @author Thomas.Haas@softwired-inc.com
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:data-type name="path"
+ * @ant.data-type name="path"
  */
 public class Path
     implements DataType, FileList
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/StringToPathConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/StringToPathConverter.java
index d68c9afdb..0d8a7e388 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/StringToPathConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/StringToPathConverter.java
@@ -17,7 +17,7 @@ import org.apache.myrmidon.framework.file.Path;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:converter source="java.lang.String" destination="org.apache.myrmidon.framework.file.Path"
+ * @ant.converter source="java.lang.String" destination="org.apache.myrmidon.framework.file.Path"
  */
 public class StringToPathConverter
     extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/filters/LineFilterSet.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/filters/LineFilterSet.java
index 4336b0ad8..2de3a2a33 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/filters/LineFilterSet.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/filters/LineFilterSet.java
@@ -14,8 +14,8 @@ import org.apache.myrmidon.api.TaskException;
 /**
  * A collection of line filters.
  *
- * @ant:data-type name="filterset"
- * @ant:type type="line-filter" name="filterset"
+ * @ant.data-type name="filterset"
+ * @ant.type type="line-filter" name="filterset"
  */
 public class LineFilterSet
     implements LineFilter
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/filters/TokenLineFilter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/filters/TokenLineFilter.java
index 4b064ea64..4532f01de 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/filters/TokenLineFilter.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/filters/TokenLineFilter.java
@@ -16,7 +16,7 @@ import org.apache.myrmidon.api.TaskException;
  *
  * @author <A href="mailto:gholam@xtra.co.nz"> Michael McCallum </A>
  *
- * @ant:type type="line-filter" name="token-filter"
+ * @ant.type type="line-filter" name="token-filter"
  */
 public class TokenLineFilter
     implements LineFilter
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ClassicProjectListener.java b/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ClassicProjectListener.java
index 2ee93ff3b..f631e08d9 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ClassicProjectListener.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ClassicProjectListener.java
@@ -15,7 +15,7 @@ import org.apache.avalon.framework.ExceptionUtil;
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
- * @ant:type type="listener" name="classic"
+ * @ant.type type="listener" name="classic"
  */
 public class ClassicProjectListener
     extends AbstractProjectListener
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/DefaultProjectListener.java b/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/DefaultProjectListener.java
index e9d9a41a3..7fb958d80 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/DefaultProjectListener.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/DefaultProjectListener.java
@@ -12,7 +12,7 @@ package org.apache.myrmidon.listeners;
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
- * @ant:type type="listener" name="default"
+ * @ant.type type="listener" name="default"
  */
 public class DefaultProjectListener
     extends ClassicProjectListener
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/NoPrefixProjectListener.java b/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/NoPrefixProjectListener.java
index 245da1ad3..e7634310c 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/NoPrefixProjectListener.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/NoPrefixProjectListener.java
@@ -12,7 +12,7 @@ package org.apache.myrmidon.listeners;
  *
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
- * @ant:type type="listener" name="noprefix"
+ * @ant.type type="listener" name="noprefix"
  */
 public class NoPrefixProjectListener
     extends DefaultProjectListener
diff --git a/proposal/myrmidon/src/manifest/ant-descriptor.j b/proposal/myrmidon/src/manifest/ant-descriptor.j
index 53953c48d..3e30c4215 100644
--- a/proposal/myrmidon/src/manifest/ant-descriptor.j
+++ b/proposal/myrmidon/src/manifest/ant-descriptor.j
@@ -3,34 +3,34 @@
   <types>
 
     <XDtClass:forAllClasses type="org.apache.myrmidon.api.Task" extent="hierarchy">
-      <XDtClass:ifHasClassTag tagName="ant:task">
-        <task name="<XDtClass:classTagValue tagName="ant:task" paramName="name"/>"
+      <XDtClass:ifHasClassTag tagName="ant.task">
+        <task name="<XDtClass:classTagValue tagName="ant.task" paramName="name"/>"
               classname="<XDtClass:fullClassName/>"/>
       </XDtClass:ifHasClassTag>
     </XDtClass:forAllClasses>
 
     <XDtClass:forAllClasses type="org.apache.myrmidon.framework.DataType" extent="hierarchy">
-      <XDtClass:ifHasClassTag tagName="ant:data-type">
-        <data-type name="<XDtClass:classTagValue tagName="ant:data-type" paramName="name"/>"
+      <XDtClass:ifHasClassTag tagName="ant.data-type">
+        <data-type name="<XDtClass:classTagValue tagName="ant.data-type" paramName="name"/>"
               classname="<XDtClass:fullClassName/>"/>
-        <task name="<XDtClass:classTagValue tagName="ant:data-type" paramName="name"/>"
+        <task name="<XDtClass:classTagValue tagName="ant.data-type" paramName="name"/>"
               classname="org.apache.myrmidon.framework.TypeInstanceTask"/>
       </XDtClass:ifHasClassTag>
     </XDtClass:forAllClasses>
 
     <XDtClass:forAllClasses extent="concrete-type">
-      <XDtClass:forAllClassTags tagName="ant:type" superclasses="false">
-        <<XDtClass:classTagValue tagName="ant:type" paramName="type" superclasses="false"/>
-          name="<XDtClass:classTagValue tagName="ant:type" paramName="name" superclasses="false"/>"
+      <XDtClass:forAllClassTags tagName="ant.type" superclasses="false">
+        <<XDtClass:classTagValue tagName="ant.type" paramName="type" superclasses="false"/>
+          name="<XDtClass:classTagValue tagName="ant.type" paramName="name" superclasses="false"/>"
           classname="<XDtClass:fullClassName/>" />
       </XDtClass:forAllClassTags>
     </XDtClass:forAllClasses>
 
     <XDtClass:forAllClasses type="org.apache.aut.converter.Converter">
-      <XDtClass:ifHasClassTag tagName="ant:converter">
+      <XDtClass:ifHasClassTag tagName="ant.converter">
         <converter classname="<XDtClass:fullClassName/>"
-                   source="<XDtClass:classTagValue tagName="ant:converter" paramName="source"/>"
-                   destination="<XDtClass:classTagValue tagName="ant:converter" paramName="destination"/>"/>
+                   source="<XDtClass:classTagValue tagName="ant.converter" paramName="source"/>"
+                   destination="<XDtClass:classTagValue tagName="ant.converter" paramName="destination"/>"/>
       </XDtClass:ifHasClassTag>
     </XDtClass:forAllClasses>
 
diff --git a/proposal/myrmidon/src/test/org/apache/antlib/core/test/PropertyTestType.java b/proposal/myrmidon/src/test/org/apache/antlib/core/test/PropertyTestType.java
index c146a77df..27510eb79 100644
--- a/proposal/myrmidon/src/test/org/apache/antlib/core/test/PropertyTestType.java
+++ b/proposal/myrmidon/src/test/org/apache/antlib/core/test/PropertyTestType.java
@@ -15,7 +15,7 @@ import org.apache.myrmidon.framework.DataType;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:data-type name="property-test-type"
+ * @ant.data-type name="property-test-type"
  */
 public class PropertyTestType
     implements DataType
diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/framework/file/test/TestFileList.java b/proposal/myrmidon/src/test/org/apache/myrmidon/framework/file/test/TestFileList.java
index c5984de5b..d134a0c48 100644
--- a/proposal/myrmidon/src/test/org/apache/myrmidon/framework/file/test/TestFileList.java
+++ b/proposal/myrmidon/src/test/org/apache/myrmidon/framework/file/test/TestFileList.java
@@ -18,7 +18,7 @@ import java.io.File;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  *
- * @ant:type type="path" name="test-file-list"
+ * @ant.type type="path" name="test-file-list"
  */
 public class TestFileList
     implements FileList
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Equals.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Equals.java
index 6b43b2804..e43c7b8a7 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Equals.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Equals.java
@@ -18,7 +18,7 @@ import org.apache.myrmidon.framework.conditions.Condition;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @version $Revision$
  *
- * @ant:type type="condition" nam="equals"
+ * @ant.type type="condition" nam="equals"
  */
 public class Equals implements Condition
 {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Http.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Http.java
index 701a1d2bf..5a5a0229d 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Http.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Http.java
@@ -21,7 +21,7 @@ import org.apache.myrmidon.framework.conditions.Condition;
  *
  * @author <a href="mailto:denis@network365.com">Denis Hennessy</a>
  *
- * @ant:type type="condition" name="http"
+ * @ant.type type="condition" name="http"
  */
 public class Http
     implements Condition
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Socket.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Socket.java
index a93a49e3f..562cc3c0a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Socket.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Socket.java
@@ -18,7 +18,7 @@ import org.apache.myrmidon.framework.conditions.Condition;
  *
  * @author <a href="mailto:denis@network365.com">Denis Hennessy</a>
  *
- * @ant:type type="condition" name="socket"
+ * @ant.type type="condition" name="socket"
  */
 public class Socket
     implements Condition
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/GlobPatternMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/GlobPatternMapper.java
index ebbd3e92d..7a2b2f6bd 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/GlobPatternMapper.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/GlobPatternMapper.java
@@ -22,7 +22,7 @@ import org.apache.myrmidon.framework.FileNameMapper;
  *
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:type type="mapper" name="glob"
+ * @ant.type type="mapper" name="glob"
  */
 public class GlobPatternMapper
     implements FileNameMapper
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/IdentityMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/IdentityMapper.java
index 5f82165ee..2498633f5 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/IdentityMapper.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/IdentityMapper.java
@@ -16,7 +16,7 @@ import org.apache.myrmidon.framework.FileNameMapper;
  *
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:type type="mapper" name="identity"
+ * @ant.type type="mapper" name="identity"
  */
 public class IdentityMapper
     implements FileNameMapper
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/MergingMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/MergingMapper.java
index 690d0208d..7788c03c5 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/MergingMapper.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/MergingMapper.java
@@ -17,7 +17,7 @@ import org.apache.myrmidon.framework.FileNameMapper;
  *
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:type type="mapper" name="merge"
+ * @ant.type type="mapper" name="merge"
  */
 public class MergingMapper
     implements FileNameMapper
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/RegexpPatternMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/RegexpPatternMapper.java
index ad3e2d3a8..fd6a72bd4 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/RegexpPatternMapper.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/RegexpPatternMapper.java
@@ -19,7 +19,7 @@ import org.apache.tools.todo.util.regexp.RegexpMatcherFactory;
  *
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:type type="mapper" name="regexp"
+ * @ant.type type="mapper" name="regexp"
  */
 public class RegexpPatternMapper
     implements FileNameMapper