Show correct subworkflow name

client/galaxy/scripts/mvc/workflow/workflow-view.js

@@ -576,7 +576,7 @@ EditorFormView = Backbone.View.extend({
                         }
                     });
                     var $add = $( '<a/>' ).attr( 'href', '#' ).html( workflow.name ).on( 'click', function() {
-                        self.add_node_for_subworkflow( workflow.id, workflow.name );
+                        self.add_node_for_subworkflow( workflow.latest_id, workflow.name );
                     });
                     $section.find( '.toolSectionBg' ).append( $( '<div/>' ).addClass( 'toolTitle' ).append( $add ).append( copy.$el ) );
                 }

lib/galaxy/workflow/modules.py

@@ -346,6 +346,11 @@ class SubWorkflowModule( WorkflowModule ):
     def default_state( Class ):
         return dict( )
 
+    def get_name( self ):
+        if hasattr( self, 'subworkflow' ) and hasattr( self.subworkflow, 'name' ):
+            return self.subworkflow.name
+        return self.name
+
     def get_errors( self ):
         return None
 
@@ -459,7 +464,7 @@ class SubWorkflowModule( WorkflowModule ):
                                          module=self, form=form )
 
     def _abstract_config_form( self ):
-        form = formbuilder.FormBuilder( title=self.name )
+        form = formbuilder.FormBuilder( title=self.get_name() )
         return form
 
     def check_and_update_state( self ):