This makes it far more easy to understand the data model and find stuff in code. Change-Id: I4613361dc40518edd94f2d4128ba412337690736