Renaming and edited class diagram