diff --git a/packages/core/index.ts b/packages/core/index.ts
index b9eec494..70f84a8b 100644
--- a/packages/core/index.ts
+++ b/packages/core/index.ts
@@ -5,8 +5,8 @@ export { Editor, Command, CommandsSpec }
 export { default as ComponentRenderer } from './src/ComponentRenderer'
 
 export * from './src/Extension'
-export * from './src/Node'
-export * from './src/Mark'
+export * from './src/NodeExtension'
+export * from './src/MarkExtension'
 export * from './src/types'
 
 export { default as nodeInputRule } from './src/inputRules/nodeInputRule'
diff --git a/packages/core/src/Mark.ts b/packages/core/src/MarkExtension.ts
similarity index 100%
rename from packages/core/src/Mark.ts
rename to packages/core/src/MarkExtension.ts
diff --git a/packages/core/src/Node.ts b/packages/core/src/NodeExtension.ts
similarity index 100%
rename from packages/core/src/Node.ts
rename to packages/core/src/NodeExtension.ts
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index 43887d50..972e8e68 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -1,6 +1,6 @@
 import { Extension } from './Extension'
-import { NodeExtension } from './Node'
-import { MarkExtension } from './Mark'
+import { NodeExtension } from './NodeExtension'
+import { MarkExtension } from './MarkExtension'
 
 export type Extensions = (Extension | NodeExtension | MarkExtension)[]
 
diff --git a/packages/core/src/utils/splitExtensions.ts b/packages/core/src/utils/splitExtensions.ts
index 05b50c73..b34a853d 100644
--- a/packages/core/src/utils/splitExtensions.ts
+++ b/packages/core/src/utils/splitExtensions.ts
@@ -1,7 +1,7 @@
 import { Extensions } from '../types'
 import { Extension } from '../Extension'
-import { NodeExtension } from '../Node'
-import { MarkExtension } from '../Mark'
+import { NodeExtension } from '../NodeExtension'
+import { MarkExtension } from '../MarkExtension'
 
 export default function splitExtensions(extensions: Extensions) {
   const baseExtensions = extensions.filter(extension => extension.type === 'extension') as Extension[]