CPP : Naming convention
Doc : Update diagram