Rename and adding diagrams