Remove dirauth related naming stuff
I'm starting on this now.