Some naming changes, removed indirection for test of stats objects