diff --git a/src/esp/metadata/CMakeLists.txt b/src/esp/metadata/CMakeLists.txt
index 64ff97d8ad..4f797c36f1 100644
--- a/src/esp/metadata/CMakeLists.txt
+++ b/src/esp/metadata/CMakeLists.txt
@@ -31,14 +31,14 @@ set(
   attributes/SemanticAttributes.cpp
   attributes/StageAttributes.h
   attributes/StageAttributes.cpp
+  diagnostics/DatasetDiagnosticsTool.h
+  diagnostics/DatasetDiagnosticsTool.cpp
   managers/AbstractAttributesManager.h
   managers/AbstractObjectAttributesManager.h
   managers/AOAttributesManager.h
   managers/AOAttributesManager.cpp
   managers/AssetAttributesManager.h
   managers/AssetAttributesManager.cpp
-  managers/DatasetDiagnosticsTool.h
-  managers/DatasetDiagnosticsTool.cpp
   managers/LightLayoutAttributesManager.h
   managers/LightLayoutAttributesManager.cpp
   managers/ObjectAttributesManager.h
diff --git a/src/esp/metadata/managers/DatasetDiagnosticsTool.cpp b/src/esp/metadata/diagnostics/DatasetDiagnosticsTool.cpp
similarity index 90%
rename from src/esp/metadata/managers/DatasetDiagnosticsTool.cpp
rename to src/esp/metadata/diagnostics/DatasetDiagnosticsTool.cpp
index e606fa3088..2df59221c7 100644
--- a/src/esp/metadata/managers/DatasetDiagnosticsTool.cpp
+++ b/src/esp/metadata/diagnostics/DatasetDiagnosticsTool.cpp
@@ -8,15 +8,13 @@
 
 namespace esp {
 namespace metadata {
-namespace managers {
+namespace diagnostics {
 
 const std::map<std::string, DSDiagnosticType> DSDiagnosticTypeMap = {
     {"savecorrected", DSDiagnosticType::SaveCorrected},
-    {"testforsceneinstanceduplicates",
-     DSDiagnosticType::TestForDuplicateInstances},
-    {"testforsemanticregionduplicates",
-     DSDiagnosticType::TestForDuplicateRegions},
-    // Future diagnostics should be listed here
+    {"sceneinstanceduplicates", DSDiagnosticType::TestForDuplicateInstances},
+    {"semanticregionduplicates", DSDiagnosticType::TestForDuplicateRegions},
+    // Future diagnostics should be listed here, before "all"
     {"all", DSDiagnosticType::AllDiagnostics},
     {"allsavecorrected", DSDiagnosticType::AllDiagnosticsSaveCorrected},
 };
@@ -76,6 +74,6 @@ bool DatasetDiagnosticsTool::setNamedDiagnostic(const std::string& diagnostic,
   return true;
 }  // DatasetDiagnosticsTool::setNamedDiagnostic
 
-}  // namespace managers
+}  // namespace diagnostics
 }  // namespace metadata
 }  // namespace esp
diff --git a/src/esp/metadata/managers/DatasetDiagnosticsTool.h b/src/esp/metadata/diagnostics/DatasetDiagnosticsTool.h
similarity index 97%
rename from src/esp/metadata/managers/DatasetDiagnosticsTool.h
rename to src/esp/metadata/diagnostics/DatasetDiagnosticsTool.h
index 5a6198e215..4d17f7c64a 100644
--- a/src/esp/metadata/managers/DatasetDiagnosticsTool.h
+++ b/src/esp/metadata/diagnostics/DatasetDiagnosticsTool.h
@@ -3,8 +3,8 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-#ifndef ESP_METADATA_MANAGERS_DATASETDIAGNOSTICSTOOL_H_
-#define ESP_METADATA_MANAGERS_DATASETDIAGNOSTICSTOOL_H_
+#ifndef ESP_METADATA_DIAGNOSTICS_DATASETDIAGNOSTICSTOOL_H_
+#define ESP_METADATA_DIAGNOSTICS_DATASETDIAGNOSTICSTOOL_H_
 
 #include "esp/core/Esp.h"
 #include "esp/io/Json.h"
@@ -12,7 +12,7 @@
 
 namespace esp {
 namespace metadata {
-namespace managers {
+namespace diagnostics {
 
 /**
  * @brief This enum class defines the various dataset diagnostics and remedies
@@ -281,8 +281,8 @@ class DatasetDiagnosticsTool {
 
 };  // class DatasetDiagnosticsTool
 
-}  // namespace managers
+}  // namespace diagnostics
 }  // namespace metadata
 }  // namespace esp
 
-#endif  // ESP_METADATA_MANAGERS_DATASETDIAGNOSTICSTOOL_H_
+#endif  // ESP_METADATA_DIAGNOSTICS_DATASETDIAGNOSTICSTOOL_H_
diff --git a/src/esp/metadata/managers/AbstractAttributesManager.h b/src/esp/metadata/managers/AbstractAttributesManager.h
index a50713e453..457d909bb9 100644
--- a/src/esp/metadata/managers/AbstractAttributesManager.h
+++ b/src/esp/metadata/managers/AbstractAttributesManager.h
@@ -9,8 +9,8 @@
  * @brief Class Template @ref esp::metadata::managers::AbstractAttributesManager
  */
 
-#include "DatasetDiagnosticsTool.h"
 #include "esp/metadata/attributes/AbstractAttributes.h"
+#include "esp/metadata/diagnostics/DatasetDiagnosticsTool.h"
 
 #include "esp/core/managedContainers/ManagedFileBasedContainer.h"
 #include "esp/io/Io.h"
@@ -31,6 +31,7 @@ namespace managers {
 using core::config::Configuration;
 using core::managedContainers::ManagedFileBasedContainer;
 using core::managedContainers::ManagedObjectAccess;
+using diagnostics::DatasetDiagnosticsTool;
 
 /**
  * @brief Class template defining responsibilities and functionality for