diff --git a/src/folk-arrow.ts b/src/folk-arrow.ts
index d2cd883..f800b96 100644
--- a/src/folk-arrow.ts
+++ b/src/folk-arrow.ts
@@ -1,5 +1,5 @@
 import { getBoxToBoxArrow } from 'perfect-arrows';
-import { FolkConnection } from './folk-connection.ts';
+import { FolkBaseConnection } from './folk-base-connection.ts';
 import { getSvgPathFromStroke, pointsOnBezierCurves } from './common/utils.ts';
 import { getStroke, StrokeOptions } from 'perfect-freehand';
 
@@ -30,7 +30,7 @@ declare global {
   }
 }
 
-export class FolkArrow extends FolkConnection {
+export class FolkArrow extends FolkBaseConnection {
   static override tagName = 'folk-arrow';
 
   #options: StrokeOptions = {
diff --git a/src/folk-connection.ts b/src/folk-base-connection.ts
similarity index 98%
rename from src/folk-connection.ts
rename to src/folk-base-connection.ts
index 3655d48..6845203 100644
--- a/src/folk-connection.ts
+++ b/src/folk-base-connection.ts
@@ -8,8 +8,8 @@ function parseCSSSelector(selector: string): string[] {
   return selector.split('>>>').map((s) => s.trim());
 }
 
-export class FolkConnection extends HTMLElement {
-  static tagName = 'folk-connection';
+export class FolkBaseConnection extends HTMLElement {
+  static tagName = 'folk-base-connection';
 
   static define() {
     if (customElements.get(this.tagName)) return;
diff --git a/src/folk-set.ts b/src/folk-base-set.ts
similarity index 94%
rename from src/folk-set.ts
rename to src/folk-base-set.ts
index 01b0366..99efe04 100644
--- a/src/folk-set.ts
+++ b/src/folk-base-set.ts
@@ -4,14 +4,14 @@ const clientRectObserver = new ClientRectObserverManager();
 
 declare global {
   interface HTMLElementTagNameMap {
-    'folk-set': FolkSet;
+    'folk-base-set': FolkBaseSet;
   }
 }
 
 const defaultRect = DOMRectReadOnly.fromRect();
 
-export class FolkSet extends HTMLElement {
-  static tagName = 'folk-set';
+export class FolkBaseSet extends HTMLElement {
+  static tagName = 'folk-base-set';
 
   static define() {
     if (customElements.get(this.tagName)) return;
diff --git a/src/folk-hull.ts b/src/folk-hull.ts
index 6f27bd1..5f3b4a3 100644
--- a/src/folk-hull.ts
+++ b/src/folk-hull.ts
@@ -1,4 +1,4 @@
-import { FolkSet } from './folk-set';
+import { FolkBaseSet } from './folk-base-set';
 import { verticesToPolygon } from './common/utils';
 import type { Point } from './common/types';
 declare global {
@@ -7,7 +7,7 @@ declare global {
   }
 }
 
-export class FolkHull extends FolkSet {
+export class FolkHull extends FolkBaseSet {
   static tagName = 'folk-hull';
 
   #hull: Point[] = [];
diff --git a/src/folk-rope.ts b/src/folk-rope.ts
index ba202e7..c967f64 100644
--- a/src/folk-rope.ts
+++ b/src/folk-rope.ts
@@ -2,7 +2,7 @@
 
 import { Vector } from './common/Vector.ts';
 import type { Point, RotatedDOMRect } from './common/types.ts';
-import { FolkConnection } from './folk-connection.ts';
+import { FolkBaseConnection } from './folk-base-connection.ts';
 
 const lerp = (first: number, second: number, percentage: number) => first + (second - first) * percentage;
 
@@ -25,7 +25,7 @@ declare global {
   }
 }
 
-export class FolkRope extends FolkConnection {
+export class FolkRope extends FolkBaseConnection {
   static override tagName = 'folk-rope';
 
   #svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
diff --git a/src/folk-xanadu.ts b/src/folk-xanadu.ts
index 8182eb7..8e915bd 100644
--- a/src/folk-xanadu.ts
+++ b/src/folk-xanadu.ts
@@ -1,7 +1,7 @@
-import { FolkConnection } from './folk-connection.js';
+import { FolkBaseConnection } from './folk-base-connection.js';
 import { verticesToPolygon } from './common/utils.js';
 import type { Point } from './common/types.js';
-export class FolkXanadu extends FolkConnection {
+export class FolkXanadu extends FolkBaseConnection {
   static tagName = 'folk-xanadu';
 
   render(sourceRect: DOMRectReadOnly, targetRect: DOMRectReadOnly): void {