deafb8590f
To clarify the official service and project naming conventions. Also, fix the official name source. Change-Id: I1887b4421453ebeed82f90bcfe92c9712b91b5df