Doc naming cleanup.