diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java
index 52f830c0f..7822dd046 100644
--- a/src/main/org/apache/tools/ant/IntrospectionHelper.java
+++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java
@@ -96,7 +96,7 @@ public final class IntrospectionHelper implements BuildListener {
      * and boolean are in here even though they get special treatment
      * - this way we only need to test for the wrapper class.
      */
-    private static final Hashtable PRIMITIVE_TYPE_MAP = new Hashtable(8);
+    private static final Map PRIMITIVE_TYPE_MAP = new HashMap(8);
 
     // Set up PRIMITIVE_TYPE_MAP
     static {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
index 3419f9832..9c8366960 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
@@ -21,8 +21,9 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
 import java.util.TimeZone;
@@ -302,7 +303,7 @@ public class Tstamp extends Task {
                                                 YEAR
                                               };
 
-        private Hashtable calendarFields = new Hashtable();
+        private Map calendarFields = new HashMap();
 
         /** Constructor for Unit enumerated type. */
         public Unit() {
diff --git a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
index 0b8935675..b51f7424c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
+++ b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
@@ -17,7 +17,8 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.condition.Condition;
@@ -187,7 +188,7 @@ public class WaitFor extends ConditionBase {
             MILLISECOND, SECOND, MINUTE, HOUR, DAY, WEEK
         };
 
-        private Hashtable timeTable = new Hashtable();
+        private Map timeTable = new HashMap();
 
         /** Constructor the Unit enumerated type. */
         public Unit() {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
index 9a7cb4e49..ec7ccc1ee 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
@@ -30,7 +30,8 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 import java.util.Vector;
 import org.apache.tools.ant.BuildException;
@@ -597,7 +598,7 @@ public class PropertyFile extends Task {
             = {MILLISECOND, SECOND, MINUTE, HOUR,
                DAY, WEEK, MONTH, YEAR };
 
-        private Hashtable calendarFields = new Hashtable();
+        private Map calendarFields = new HashMap();
 
         public Unit() {
             calendarFields.put(MILLISECOND,