Fix Style Cop warnings
Rename Class Diagram