Not 100%, because this was compiled decades before I got on, but Hartnett sounds right. Not to take away from Glynn - a great chief and great commander.
This was handdrawn in the 70's or 80's. A good resource, but you need to reeeeally be familiar with the buildings, and then the book itself...