diff --git a/src/Common/H5Utils.cpp b/src/Common/H5Utils.cpp
index 7ca35d2..6809c14 100644
--- a/src/Common/H5Utils.cpp
+++ b/src/Common/H5Utils.cpp
@@ -1054,7 +1054,7 @@ namespace H5Utils
 		return nullptr;
 	}
 
-	Dataset<Points> createPointsDataset(mv::CoreInterface* core, bool ask, QString suggestion)
+	mv::Dataset<Points> createPointsDataset(mv::CoreInterface* core, bool ask, QString suggestion)
 	{
 		QString dataSetName = suggestion;
 		
@@ -1128,7 +1128,7 @@ namespace H5Utils
 		}
 
 		QString datasetName = prefix.isEmpty() ? name : prefix + name;
-		Dataset<Clusters> clusterDataset = mv::data().createDataset("Cluster", datasetName, parent);
+		mv::Dataset<Clusters> clusterDataset = mv::data().createDataset("Cluster", datasetName, parent);
 
 		clusterDataset->getClusters().reserve(indices.size());
 
@@ -1146,7 +1146,7 @@ namespace H5Utils
 		}
 
 		// Notify others that the clusters have changed
-		events().notifyDatasetDataChanged(clusterDataset);
+		mv::events().notifyDatasetDataChanged(clusterDataset);
 	}
 		
 
diff --git a/src/H5ADLoader/H5ADUtils.h b/src/H5ADLoader/H5ADUtils.h
index c1658a2..8e01606 100644
--- a/src/H5ADLoader/H5ADUtils.h
+++ b/src/H5ADLoader/H5ADUtils.h
@@ -10,7 +10,7 @@ namespace H5AD
 {
 	struct LoaderInfo
 	{
-		Dataset<Points> _pointsDataset;
+		mv::Dataset<Points> _pointsDataset;
 		std::vector<QString> _originalDimensionNames;
 		QVariantList _sampleNames;
 		std::vector<bool> _enabledDimensions;
@@ -33,7 +33,7 @@ namespace H5AD
 
 	bool LoadCategories(H5::Group& group, std::map<std::string, std::vector<QString>>& categories);
 
-	DataHierarchyItem* GetDerivedDataset(const QString& name, Dataset<Points>& pointsDataset);
+	mv::DataHierarchyItem* GetDerivedDataset(const QString& name, mv::Dataset<Points>& pointsDataset);
 
 	bool LoadCodedCategories(H5::Group& group, std::map<QString, std::vector<unsigned>>& result);