diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Jar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Jar.java
index d9b9a9fbb..562dd5ef0 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Jar.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Jar.java
@@ -22,7 +22,7 @@ import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.types.FileScanner;
 import org.apache.tools.ant.types.ZipFileSet;
-import org.apache.tools.zip.ZipOutputStream;
+import org.apache.aut.zip.ZipOutputStream;
 
 /**
  * Creates a JAR archive.
@@ -127,7 +127,7 @@ public class Jar
         getLogger().warn( message );
     }
 
-    public void addConfiguredManifest( Manifest newManifest )
+    public void addManifest( Manifest newManifest )
         throws ManifestException, TaskException
     {
         if( m_manifest == null )
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java
index 2b36249d1..be45b11cf 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java
@@ -32,7 +32,8 @@ import org.apache.tools.ant.types.EnumeratedAttribute;
  * @author <a href="mailto:conor@apache.org">Conor MacNeill</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  */
-public class Manifest extends Task
+public class Manifest
+    extends Task
 {
     /**
      * The standard manifest version header
@@ -152,7 +153,7 @@ public class Manifest extends Task
 
             section.setName( nextSectionName );
             nextSectionName = section.read( reader );
-            addConfiguredSection( section );
+            addSection( section );
         }
     }
 
@@ -239,13 +240,13 @@ public class Manifest extends Task
         return warnings.iterator();
     }
 
-    public void addConfiguredAttribute( Attribute attribute )
+    public void addAttribute( final Attribute attribute )
         throws ManifestException, TaskException
     {
-        mainSection.addConfiguredAttribute( attribute );
+        mainSection.addAttribute( attribute );
     }
 
-    public void addConfiguredSection( Section section )
+    public void addSection( final Section section )
         throws ManifestException, TaskException
     {
         if( section.getName() == null )
@@ -446,7 +447,7 @@ public class Manifest extends Task
         {
             try
             {
-                mainSection.addConfiguredAttribute( new Attribute( ATTRIBUTE_SIGNATURE_VERSION, signatureVersion ) );
+                mainSection.addAttribute( new Attribute( ATTRIBUTE_SIGNATURE_VERSION, signatureVersion ) );
             }
             catch( ManifestException e )
             {
@@ -772,7 +773,7 @@ public class Manifest extends Task
             return null;
         }
 
-        public void addConfiguredAttribute( Attribute attribute )
+        public void addAttribute( Attribute attribute )
             throws ManifestException, TaskException
         {
             String check = addAttributeAndCheck( attribute );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Jar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Jar.java
index d9b9a9fbb..562dd5ef0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Jar.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Jar.java
@@ -22,7 +22,7 @@ import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.types.FileScanner;
 import org.apache.tools.ant.types.ZipFileSet;
-import org.apache.tools.zip.ZipOutputStream;
+import org.apache.aut.zip.ZipOutputStream;
 
 /**
  * Creates a JAR archive.
@@ -127,7 +127,7 @@ public class Jar
         getLogger().warn( message );
     }
 
-    public void addConfiguredManifest( Manifest newManifest )
+    public void addManifest( Manifest newManifest )
         throws ManifestException, TaskException
     {
         if( m_manifest == null )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java
index 2b36249d1..be45b11cf 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java
@@ -32,7 +32,8 @@ import org.apache.tools.ant.types.EnumeratedAttribute;
  * @author <a href="mailto:conor@apache.org">Conor MacNeill</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  */
-public class Manifest extends Task
+public class Manifest
+    extends Task
 {
     /**
      * The standard manifest version header
@@ -152,7 +153,7 @@ public class Manifest extends Task
 
             section.setName( nextSectionName );
             nextSectionName = section.read( reader );
-            addConfiguredSection( section );
+            addSection( section );
         }
     }
 
@@ -239,13 +240,13 @@ public class Manifest extends Task
         return warnings.iterator();
     }
 
-    public void addConfiguredAttribute( Attribute attribute )
+    public void addAttribute( final Attribute attribute )
         throws ManifestException, TaskException
     {
-        mainSection.addConfiguredAttribute( attribute );
+        mainSection.addAttribute( attribute );
     }
 
-    public void addConfiguredSection( Section section )
+    public void addSection( final Section section )
         throws ManifestException, TaskException
     {
         if( section.getName() == null )
@@ -446,7 +447,7 @@ public class Manifest extends Task
         {
             try
             {
-                mainSection.addConfiguredAttribute( new Attribute( ATTRIBUTE_SIGNATURE_VERSION, signatureVersion ) );
+                mainSection.addAttribute( new Attribute( ATTRIBUTE_SIGNATURE_VERSION, signatureVersion ) );
             }
             catch( ManifestException e )
             {
@@ -772,7 +773,7 @@ public class Manifest extends Task
             return null;
         }
 
-        public void addConfiguredAttribute( Attribute attribute )
+        public void addAttribute( Attribute attribute )
             throws ManifestException, TaskException
         {
             String check = addAttributeAndCheck( attribute );