Support renaming from diagrams
Tidy up ConceptDiagramPortlet