Changed header-private namespace naming scheme.