diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py
index 263437fe72f..8c9ab61ffd5 100755
--- a/lib/galaxy/tools/__init__.py
+++ b/lib/galaxy/tools/__init__.py
@@ -295,15 +295,17 @@ class ToolOutput( ToolOutputBase ):
 
 class ToolOutputCollection( ToolOutputBase ):
     """
-    Represents a HistoryDatasetCollectionAssociation of  output datasets produced by a tool.
+    Represents a HistoryDatasetCollectionAssociation of output datasets produced
+    by a tool.
+
     <outputs>
-      <dataset_collection type="list" label="${tool.name} on ${on_string} fasta">
+      <collection type="list" label="${tool.name} on ${on_string} fasta">
         <discover_datasets pattern="__name__" ext="fasta" visible="True" directory="outputFiles" />
-      </dataset_collection>
-      <dataset_collection type="paired" label="${tool.name} on ${on_string} paired reads">
+      </collection>
+      <collection type="paired" label="${tool.name} on ${on_string} paired reads">
         <data name="forward" format="fastqsanger" />
         <data name="reverse" format="fastqsanger"/>
-      </dataset_collection>
+      </collection>
     <outputs>
     """
 
@@ -337,13 +339,10 @@ class ToolOutputCollection( ToolOutputBase ):
         if self.dynamic_structure:
             return []
 
-        def to_part( ( element_identifier, output ) ):
-            return ToolOutputCollectionPart( self, element_identifier, output )
-
         # This line is probably not right - should verify structured_like
         # or have outputs and all outputs have name.
         if len( self.outputs ) > 1:
-            output_parts = map( to_part, self.outputs )
+            output_parts = [ToolOutputCollectionPart(self, k, v) for k, v in self.outputs.iteritems()]
         else:
             # either must have specified structured_like or something worse
             if self.structure.structured_like: