diff --git a/src/base/statistics.cc b/src/base/statistics.cc
index 39e76b6dac..c3801436e7 100644
--- a/src/base/statistics.cc
+++ b/src/base/statistics.cc
@@ -111,7 +111,7 @@ InfoAccess::setInit()
 Info *
 InfoAccess::info()
 {
-    if (_info) {
+    if (newStyleStats()) {
         // New-style stats
         return _info;
     } else {
@@ -125,7 +125,7 @@ InfoAccess::info()
 const Info *
 InfoAccess::info() const
 {
-    if (_info) {
+    if (newStyleStats()) {
         // New-style stats
         return _info;
     } else {
@@ -136,6 +136,12 @@ InfoAccess::info() const
     }
 }
 
+bool
+InfoAccess::newStyleStats() const
+{
+    return _info != nullptr;
+}
+
 Formula::Formula(Group *parent, const char *name, const char *desc)
     : DataWrapVec<Formula, FormulaInfoProxy>(
             parent, name, units::Unspecified::get(), desc)
diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 5079443fb4..24cbf714f5 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -198,6 +198,9 @@ class InfoAccess
     /** Grab the information class for this statistic */
     const Info *info() const;
 
+    /** Check if the info is new style stats */
+    bool newStyleStats() const;
+
   public:
     InfoAccess()
         : _info(nullptr) {};
@@ -259,7 +262,7 @@ class DataWrap : public InfoAccess
             parent->addStat(info);
 
         if (name) {
-            info->setName(name, parent == nullptr);
+            info->setName(name, !newStyleStats());
             info->flags.set(display);
         }
 
@@ -286,7 +289,7 @@ class DataWrap : public InfoAccess
     name(const std::string &name)
     {
         Info *info = this->info();
-        info->setName(name);
+        info->setName(name, !newStyleStats());
         info->flags.set(display);
         return this->self();
     }