diff --git a/core/src/main/java/io/xpipe/core/source/CollectionDataSourceDescriptor.java b/core/src/main/java/io/xpipe/core/source/CollectionDataSource.java
similarity index 76%
rename from core/src/main/java/io/xpipe/core/source/CollectionDataSourceDescriptor.java
rename to core/src/main/java/io/xpipe/core/source/CollectionDataSource.java
index c212d920..9c9ad757 100644
--- a/core/src/main/java/io/xpipe/core/source/CollectionDataSourceDescriptor.java
+++ b/core/src/main/java/io/xpipe/core/source/CollectionDataSource.java
@@ -5,21 +5,21 @@ import io.xpipe.core.store.DataStore;
 import java.util.HashMap;
 import java.util.Map;
 
-public abstract class CollectionDataSourceDescriptor<DS extends DataStore> extends DataSourceDescriptor<DS> {
+public abstract class CollectionDataSource<DS extends DataStore> extends DataSourceDescriptor<DS> {
 
     private final Map<String, String> preferredProviders;
 
-    public CollectionDataSourceDescriptor(DS store) {
+    public CollectionDataSource(DS store) {
         super(store);
         this.preferredProviders = new HashMap<>();
     }
 
-    public CollectionDataSourceDescriptor<DS> annotate(String file, String provider) {
+    public CollectionDataSource<DS> annotate(String file, String provider) {
         preferredProviders.put(file, provider);
         return this;
     }
 
-    public CollectionDataSourceDescriptor<DS> annotate(Map<String, String> preferredProviders) {
+    public CollectionDataSource<DS> annotate(Map<String, String> preferredProviders) {
         this.preferredProviders.putAll(preferredProviders);
         return this;
     }
diff --git a/core/src/main/java/io/xpipe/core/source/DataSourceDescriptor.java b/core/src/main/java/io/xpipe/core/source/DataSource.java
similarity index 100%
rename from core/src/main/java/io/xpipe/core/source/DataSourceDescriptor.java
rename to core/src/main/java/io/xpipe/core/source/DataSource.java
diff --git a/core/src/main/java/io/xpipe/core/source/RawDataSourceDescriptor.java b/core/src/main/java/io/xpipe/core/source/RawDataSource.java
similarity index 100%
rename from core/src/main/java/io/xpipe/core/source/RawDataSourceDescriptor.java
rename to core/src/main/java/io/xpipe/core/source/RawDataSource.java
diff --git a/core/src/main/java/io/xpipe/core/source/StructureDataSourceDescriptor.java b/core/src/main/java/io/xpipe/core/source/StructureDataSource.java
similarity index 100%
rename from core/src/main/java/io/xpipe/core/source/StructureDataSourceDescriptor.java
rename to core/src/main/java/io/xpipe/core/source/StructureDataSource.java
diff --git a/core/src/main/java/io/xpipe/core/source/TableDataSourceDescriptor.java b/core/src/main/java/io/xpipe/core/source/TableDataSource.java
similarity index 100%
rename from core/src/main/java/io/xpipe/core/source/TableDataSourceDescriptor.java
rename to core/src/main/java/io/xpipe/core/source/TableDataSource.java
diff --git a/core/src/main/java/io/xpipe/core/source/TextDataSourceDescriptor.java b/core/src/main/java/io/xpipe/core/source/TextDataSource.java
similarity index 100%
rename from core/src/main/java/io/xpipe/core/source/TextDataSourceDescriptor.java
rename to core/src/main/java/io/xpipe/core/source/TextDataSource.java