diff --git a/packages/components/data-source/src/array-data-source.spec.ts b/packages/components/data-source/src/array-data-source.spec.ts
index 636134b95..20eb15246 100644
--- a/packages/components/data-source/src/array-data-source.spec.ts
+++ b/packages/components/data-source/src/array-data-source.spec.ts
@@ -38,7 +38,7 @@ describe('ArrayDataSource', () => {
     it('should emit an sl-update event when calling update()', () => {
       const onUpdate = spy();
 
-      ds.addEventListener('sl-data-source-update', onUpdate);
+      ds.addEventListener('sl-update', onUpdate);
       ds.update();
 
       expect(onUpdate).to.have.been.calledOnce;
@@ -138,7 +138,7 @@ describe('ArrayDataSource', () => {
       expect(ds.items.map(({ firstName }) => firstName)).to.deep.equal(['John', 'Jane', 'Bob', 'Ann', 'Ann']);
     });
 
-    it('should reset the filtered items when removing a sort', () => {
+    it('should reset the original order when removing a sort', () => {
       ds.setSort('id', 'firstName', 'asc');
       ds.update();
 
diff --git a/packages/components/data-source/src/array-data-source.ts b/packages/components/data-source/src/array-data-source.ts
index 92b3472c3..32b87fb98 100644
--- a/packages/components/data-source/src/array-data-source.ts
+++ b/packages/components/data-source/src/array-data-source.ts
@@ -126,6 +126,6 @@ export class ArrayDataSource<T = any> extends DataSource<T> {
     }
 
     this.#filteredItems = items;
-    this.dispatchEvent(new CustomEvent('sl-data-source-update', { detail: { dataSource: this } }));
+    this.dispatchEvent(new CustomEvent('sl-update', { detail: { dataSource: this } }));
   }
 }
diff --git a/packages/components/data-source/src/data-source.ts b/packages/components/data-source/src/data-source.ts
index 6bd366252..f5298541e 100644
--- a/packages/components/data-source/src/data-source.ts
+++ b/packages/components/data-source/src/data-source.ts
@@ -1,6 +1,6 @@
 declare global {
   interface GlobalEventHandlersEventMap {
-    'sl-data-source-update': DataSourceUpdateEvent;
+    'sl-update': DataSourceUpdateEvent;
   }
 }
 
diff --git a/packages/components/data-source/src/fetch-data-source.spec.ts b/packages/components/data-source/src/fetch-data-source.spec.ts
index 221a4ce70..a9a105c41 100644
--- a/packages/components/data-source/src/fetch-data-source.spec.ts
+++ b/packages/components/data-source/src/fetch-data-source.spec.ts
@@ -36,7 +36,7 @@ describe('FetchDataSource', () => {
   it('should emit an update event when calling update()', () => {
     const onUpdate = spy();
 
-    ds.addEventListener('sl-data-source-update', onUpdate);
+    ds.addEventListener('sl-update', onUpdate);
     ds.update();
 
     expect(onUpdate).to.have.been.calledOnce;
@@ -146,7 +146,7 @@ describe('FetchDataSource', () => {
       const onUpdate = spy();
 
       ds.update();
-      ds.addEventListener('sl-data-source-update', onUpdate);
+      ds.addEventListener('sl-update', onUpdate);
       ds.items.at(0);
 
       expect(onUpdate).not.to.have.been.called;
diff --git a/packages/components/data-source/src/fetch-data-source.ts b/packages/components/data-source/src/fetch-data-source.ts
index 62b8bdaf2..08597766c 100644
--- a/packages/components/data-source/src/fetch-data-source.ts
+++ b/packages/components/data-source/src/fetch-data-source.ts
@@ -89,7 +89,7 @@ export class FetchDataSource<T = any> extends DataSource<T> {
     this.#items = new Array<T>(this.size);
     this.#pages = {};
     this.#proxy = this.#createProxy(this.#items);
-    this.dispatchEvent(new CustomEvent('sl-data-source-update', { detail: { dataSource: this } }));
+    this.dispatchEvent(new CustomEvent('sl-update', { detail: { dataSource: this } }));
   }
 
   /**
@@ -148,7 +148,7 @@ export class FetchDataSource<T = any> extends DataSource<T> {
           this.#items[pageSize * (page - 1) + i] = res.items[i];
         }
 
-        this.dispatchEvent(new CustomEvent('sl-data-source-update', { detail: { dataSource: this } }));
+        this.dispatchEvent(new CustomEvent('sl-update', { detail: { dataSource: this } }));
       })();
     }
 
diff --git a/packages/components/grid/src/view-model.ts b/packages/components/grid/src/view-model.ts
index 16405a4e5..580e49329 100644
--- a/packages/components/grid/src/view-model.ts
+++ b/packages/components/grid/src/view-model.ts
@@ -44,11 +44,11 @@ export class GridViewModel<T = any> {
 
   set dataSource(dataSource: DataSource<T> | undefined) {
     if (this.#dataSource) {
-      this.#dataSource.removeEventListener('sl-data-source-update', this.update);
+      this.#dataSource.removeEventListener('sl-update', this.update);
     }
 
     this.#dataSource = dataSource;
-    this.#dataSource?.addEventListener('sl-data-source-update', this.update);
+    this.#dataSource?.addEventListener('sl-update', this.update);
 
     this.update();
   }