diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/buildmodel/IBuildCommand.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/buildmodel/IBuildCommand.java
index a6f91cd8b6f..3e913fa8ea4 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/buildmodel/IBuildCommand.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/buildmodel/IBuildCommand.java
@@ -40,11 +40,11 @@ public interface IBuildCommand {
 	
 	/**
 	 * Returns the Map representing the environment to be used for the executable process
-	 * The map conntains the String to String pairs representing the variable name and value respectively
+	 * The map contains the String to String pairs representing the variable name and value respectively
 	 * 
 	 * @return Map
 	 */
-	Map getEnvironment();
+	Map<String, String> getEnvironment();
 	
 	/**
 	 * Returns the working directory to be used for the process
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildProcessManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildProcessManager.java
index e03abc9b7c9..417d998b2b4 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildProcessManager.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildProcessManager.java
@@ -17,9 +17,10 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
 import org.eclipse.cdt.managedbuilder.buildmodel.IBuildCommand;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
@@ -135,18 +136,18 @@ public class BuildProcessManager {
 	/**
 	 * Converts map to strings array
 	 */
-	protected String[] mapToStringArray(Map map){
+	protected String[] mapToStringArray(Map<String, String> map){
 		if(map == null)
 			return null;
 		
-		List list = new ArrayList();
+		List<String> list = new ArrayList<String>();
 		
-		for(Iterator iter = map.entrySet().iterator(); iter.hasNext();){
-			Map.Entry entry = (Map.Entry)iter.next();
-			list.add((String)entry.getKey() + "=" + (String)entry.getValue());	//$NON-NLS-1$
+		Set<Entry<String, String>> entrySet = map.entrySet();
+		for (Entry<String, String> entry : entrySet) {
+			list.add(entry.getKey() + '=' + entry.getValue());
 		}
 		
-		return (String[])list.toArray(new String[list.size()]);
+		return list.toArray(new String[list.size()]);
 	}
 	
 	/**