Doctrine naming strategy for 2.2
Some reformatting