diff --git a/demo/Playground.tsx b/demo/Playground.tsx
index cab4a17c..23499b0d 100644
--- a/demo/Playground.tsx
+++ b/demo/Playground.tsx
@@ -5,10 +5,10 @@ import {toaster} from '@gravity-ui/uikit/toaster-singleton-react-18';
 
 import {MarkupString, logger} from '../src';
 import {
-    YfmEditorType,
-    YfmEditorView,
+    MarkdownEditorType,
+    MarkdownEditorView,
     markupToolbarConfigs,
-    useYfmEditor,
+    useMarkdownEditor,
     wysiwygToolbarConfigs,
 } from '../src/bundle';
 import {RenderPreview, ToolbarActionData} from '../src/bundle/Editor';
@@ -54,7 +54,7 @@ export type PlaygroundProps = {
     initial?: MarkupString;
     allowHTML?: boolean;
     settingsVisible?: boolean;
-    initialEditor?: YfmEditorType;
+    initialEditor?: MarkdownEditorType;
     breaks?: boolean;
     linkify?: boolean;
     linkifyTlds?: string | string[];
@@ -90,7 +90,9 @@ export const Playground = React.memo<PlaygroundProps>((props) => {
         renderPreviewDefined,
         height,
     } = props;
-    const [editorType, setEditorType] = React.useState<YfmEditorType>(initialEditor ?? 'wysiwyg');
+    const [editorType, setEditorType] = React.useState<MarkdownEditorType>(
+        initialEditor ?? 'wysiwyg',
+    );
     const [mdRaw, setMdRaw] = React.useState<MarkupString>(initial || '');
 
     React.useEffect(() => {
@@ -112,7 +114,7 @@ export const Playground = React.memo<PlaygroundProps>((props) => {
         [allowHTML, breaks, linkify, linkifyTlds, sanitizeHtml],
     );
 
-    const mdEditor = useYfmEditor({
+    const mdEditor = useMarkdownEditor({
         allowHTML,
         linkify,
         linkifyTlds,
@@ -164,7 +166,7 @@ export const Playground = React.memo<PlaygroundProps>((props) => {
         function onChange() {
             setMdRaw(mdEditor.getValue());
         }
-        function onChangeEditorType({type}: {type: YfmEditorType}) {
+        function onChangeEditorType({type}: {type: MarkdownEditorType}) {
             setEditorType(type);
         }
         const onToolbarAction = ({id, editorType: type}: ToolbarActionData) => {
@@ -263,7 +265,7 @@ export const Playground = React.memo<PlaygroundProps>((props) => {
             <hr />
             <React.StrictMode>
                 <div className={b('editor')} style={{height: height ?? 'initial'}}>
-                    <YfmEditorView
+                    <MarkdownEditorView
                         autofocus
                         toaster={toaster}
                         className={b('editor-view')}
diff --git a/demo/editor-in-editor/EditorInEditorExtension/index.tsx b/demo/editor-in-editor/EditorInEditorExtension/index.tsx
index 99796bb0..1a244b9a 100644
--- a/demo/editor-in-editor/EditorInEditorExtension/index.tsx
+++ b/demo/editor-in-editor/EditorInEditorExtension/index.tsx
@@ -6,7 +6,7 @@ import {EditorView, NodeView} from 'prosemirror-view';
 import {createPortal} from 'react-dom';
 
 import {ExtensionAuto, getReactRendererFromState} from '../../../src';
-import {YfmEditorView, YfmEditorViewProps, useYfmEditor} from '../../../src/bundle';
+import {MarkdownEditorView, MarkdownEditorViewProps, useMarkdownEditor} from '../../../src/bundle';
 
 import './index.scss';
 
@@ -102,11 +102,11 @@ class EditorInEditorNodeView implements NodeView {
 
 type YfmEditorProps = {
     initialContent: string;
-    toaster: YfmEditorViewProps['toaster'];
+    toaster: MarkdownEditorViewProps['toaster'];
 };
 
 function InnerEditor({initialContent, toaster}: YfmEditorProps) {
-    const mdEditor = useYfmEditor({
+    const mdEditor = useMarkdownEditor({
         initialMarkup: initialContent,
         initialEditorType: 'wysiwyg',
         initialToolbarVisible: true,
@@ -115,7 +115,7 @@ function InnerEditor({initialContent, toaster}: YfmEditorProps) {
         allowHTML: false,
     });
     return (
-        <YfmEditorView
+        <MarkdownEditorView
             editor={mdEditor}
             toaster={toaster}
             settingsVisible={false}
diff --git a/demo/editor-in-editor/index.tsx b/demo/editor-in-editor/index.tsx
index 6cdfeb42..6297bfb6 100644
--- a/demo/editor-in-editor/index.tsx
+++ b/demo/editor-in-editor/index.tsx
@@ -3,7 +3,7 @@ import React, {useEffect} from 'react';
 import {toaster} from '@gravity-ui/uikit/toaster-singleton-react-18';
 
 import {BaseNode} from '../../src';
-import {YfmEditorView, useYfmEditor} from '../../src/bundle';
+import {MarkdownEditorView, useMarkdownEditor} from '../../src/bundle';
 import {VERSION} from '../../src/version';
 import {block} from '../cn';
 
@@ -16,7 +16,7 @@ import {
 const b = block('playground');
 
 export const PlaygroundEditorInEditor: React.FC = () => {
-    const mdEditor = useYfmEditor({
+    const mdEditor = useMarkdownEditor({
         initialEditorType: 'wysiwyg',
         initialToolbarVisible: true,
         allowHTML: false,
@@ -52,7 +52,7 @@ export const PlaygroundEditorInEditor: React.FC = () => {
             </div>
             <hr />
             <div className={b('editor')}>
-                <YfmEditorView
+                <MarkdownEditorView
                     stickyToolbar
                     settingsVisible
                     editor={mdEditor}
diff --git a/src/bundle/HorizontalDrag.tsx b/src/bundle/HorizontalDrag.tsx
index e649f211..c7e3b05b 100644
--- a/src/bundle/HorizontalDrag.tsx
+++ b/src/bundle/HorizontalDrag.tsx
@@ -3,7 +3,7 @@ import React, {EventHandler, useCallback, useEffect, useRef, useState} from 'rea
 import {clamp} from '../lodash';
 
 import {EditorInt} from './Editor';
-import {cnEditorComponent} from './YfmEditorView';
+import {cnEditorComponent} from './MarkdownEditorView';
 
 export const IN_RESIZE_CLASSNAME = 'in-resize';
 
diff --git a/src/bundle/YfmEditorView.scss b/src/bundle/MarkdownEditorView.scss
similarity index 100%
rename from src/bundle/YfmEditorView.scss
rename to src/bundle/MarkdownEditorView.scss
diff --git a/src/bundle/MarkdownEditorView.tsx b/src/bundle/MarkdownEditorView.tsx
new file mode 100644
index 00000000..8e4580f5
--- /dev/null
+++ b/src/bundle/MarkdownEditorView.tsx
@@ -0,0 +1,285 @@
+import React, {MutableRefObject, useEffect, useMemo, useRef, useState} from 'react';
+
+import type {ToasterPublicMethods} from '@gravity-ui/uikit';
+import {ErrorBoundary} from 'react-error-boundary';
+import {useEnsuredForwardedRef, useKey, useUpdate} from 'react-use';
+
+import {ClassNameProps, cn} from '../classname';
+import {i18n} from '../i18n/bundle';
+import {logger} from '../logger';
+import {useBooleanState} from '../react-utils/hooks';
+import {ToasterContext} from '../react-utils/toaster';
+import {useSticky} from '../react-utils/useSticky';
+import {isMac} from '../utils/platform';
+
+import type {Editor, EditorInt, EditorType} from './Editor';
+import {HorizontalDrag} from './HorizontalDrag';
+import {MarkupEditorView} from './MarkupEditorView';
+import {SplitModeView} from './SplitModeView';
+import {WysiwygEditorView} from './WysiwygEditorView';
+import {MToolbarData, MToolbarSingleItemData, mHiddenData, mToolbarConfig} from './config/markup';
+import {WToolbarData, WToolbarItemData, wHiddenData, wToolbarConfig} from './config/wysiwyg';
+import {useMarkdownEditorContext} from './context';
+import {EditorSettings, EditorSettingsProps} from './settings';
+import {stickyCn} from './sticky';
+
+import '../styles/styles.scss';
+import './MarkdownEditorView.scss'; // eslint-disable-line import/order
+
+export const cnEditorComponent = cn('editor-component');
+const b = cnEditorComponent;
+
+export type MarkdownEditorViewProps = ClassNameProps & {
+    editor?: Editor;
+    autofocus?: boolean;
+    markupToolbarConfig?: MToolbarData;
+    wysiwygToolbarConfig?: WToolbarData;
+    markupHiddenActionsConfig?: MToolbarSingleItemData[];
+    wysiwygHiddenActionsConfig?: WToolbarItemData[];
+    /** @default true */
+    settingsVisible?: boolean;
+    toaster: ToasterPublicMethods;
+    stickyToolbar: boolean;
+};
+
+export const MarkdownEditorView = React.forwardRef<HTMLDivElement, MarkdownEditorViewProps>(
+    (props, ref) => {
+        const divRef = useEnsuredForwardedRef(ref as MutableRefObject<HTMLDivElement>);
+
+        const [isMounted, setIsMounted] = useState(false);
+        useEffect(() => {
+            setIsMounted(true);
+        }, []);
+
+        const [showPreview, , unsetShowPreview, toggleShowPreview] = useBooleanState(false);
+
+        const context = useMarkdownEditorContext();
+        const editor = (props.editor ?? context) as EditorInt;
+        if (!editor)
+            throw new Error(
+                '[MarkdownEditorView]: an instance of the editor must be passed through the props or context',
+            );
+
+        const {
+            autofocus,
+            className,
+            settingsVisible = true,
+            markupToolbarConfig = mToolbarConfig,
+            wysiwygToolbarConfig = wToolbarConfig,
+            markupHiddenActionsConfig = mHiddenData,
+            wysiwygHiddenActionsConfig = wHiddenData,
+            toaster,
+            stickyToolbar,
+        } = props;
+
+        const rerender = useUpdate();
+        React.useLayoutEffect(() => {
+            editor.on('rerender', rerender);
+            return () => {
+                editor.off('rerender', rerender);
+            };
+        }, [editor, rerender]);
+
+        const onModeChange = React.useCallback(
+            (type: EditorType) => {
+                editor.changeEditorType({type, reason: 'settings'});
+                unsetShowPreview();
+            },
+            [editor, unsetShowPreview],
+        );
+        const onToolbarVisibilityChange = React.useCallback(
+            (visible: boolean) => {
+                editor.changeToolbarVisibility({visible});
+            },
+            [editor],
+        );
+        const onSplitModeChange = React.useCallback(
+            (splitModeEnabled: boolean) => {
+                unsetShowPreview();
+                editor.changeSplitModeEnabled({splitModeEnabled});
+            },
+            [editor, unsetShowPreview],
+        );
+
+        const onShowPreviewChange = React.useCallback(
+            (showPreviewValue: boolean) => {
+                editor.changeSplitModeEnabled({splitModeEnabled: false});
+                if (showPreviewValue !== showPreview) toggleShowPreview();
+            },
+            [editor, showPreview, toggleShowPreview],
+        );
+
+        const editorType = editor.currentType;
+        const markupSplitMode =
+            editor.splitModeEnabled && editor.splitMode && editorType === 'markup';
+        const canRenderPreview = Boolean(
+            editor.renderPreview && editorType === 'markup' && !editor.splitModeEnabled,
+        );
+
+        useKey(
+            (e) => canRenderPreview && isPreviewKeyDown(e),
+            () => onShowPreviewChange(!showPreview),
+            {event: 'keydown'},
+            [showPreview, editorType, onShowPreviewChange, canRenderPreview],
+        );
+
+        const editorWrapperRef = useRef(null);
+        const splitModeViewWrapperRef = useRef(null);
+
+        const settings = useMemo(
+            () => (
+                <Settings
+                    mode={editorType}
+                    onModeChange={onModeChange}
+                    toolbarVisibility={editor.toolbarVisible && !showPreview}
+                    onToolbarVisibilityChange={onToolbarVisibilityChange}
+                    onSplitModeChange={onSplitModeChange}
+                    splitModeEnabled={editor.splitModeEnabled}
+                    splitMode={editor.splitMode}
+                    stickyToolbar={stickyToolbar}
+                    onShowPreviewChange={onShowPreviewChange}
+                    showPreview={showPreview}
+                    renderPreviewButton={canRenderPreview}
+                />
+            ),
+            [
+                canRenderPreview,
+                stickyToolbar,
+                editor.splitMode,
+                editor.splitModeEnabled,
+                editor.toolbarVisible,
+                editorType,
+                onModeChange,
+                onShowPreviewChange,
+                onSplitModeChange,
+                onToolbarVisibilityChange,
+                showPreview,
+            ],
+        );
+
+        return (
+            <ErrorBoundary
+                onError={(e) => {
+                    logger.error(e);
+                }}
+                fallbackRender={({error, resetErrorBoundary}) => {
+                    toaster.add({
+                        theme: 'danger',
+                        name: 'g-md-editor-error',
+                        title: i18n('error-title'),
+                        content: error.message,
+                    });
+                    setTimeout(() => {
+                        resetErrorBoundary();
+                        editor.changeEditorType({type: 'markup', reason: 'error-boundary'});
+                    });
+                    return null;
+                }}
+            >
+                <ToasterContext.Provider value={toaster}>
+                    <div
+                        ref={divRef}
+                        className={b(
+                            {
+                                settings: settingsVisible,
+                                split: markupSplitMode && editor.splitMode,
+                            },
+                            [className],
+                        )}
+                    >
+                        <div className={b('editor-wrapper')} ref={editorWrapperRef}>
+                            {showPreview ? (
+                                <>
+                                    <div className={b('preview-wrapper')}>
+                                        {editor.renderPreview?.({
+                                            getValue: editor.getValue,
+                                            mode: 'preview',
+                                        })}
+                                    </div>
+                                    {settings}
+                                </>
+                            ) : (
+                                <>
+                                    {editorType === 'wysiwyg' && (
+                                        <WysiwygEditorView
+                                            editor={editor}
+                                            autofocus={autofocus}
+                                            settingsVisible={settingsVisible}
+                                            toolbarConfig={wysiwygToolbarConfig}
+                                            toolbarVisible={editor.toolbarVisible}
+                                            hiddenActionsConfig={wysiwygHiddenActionsConfig}
+                                            className={b('editor', {type: editorType})}
+                                            toolbarClassName={b('toolbar')}
+                                            stickyToolbar={stickyToolbar}
+                                        >
+                                            {editor.toolbarVisible && settingsVisible && settings}
+                                        </WysiwygEditorView>
+                                    )}
+                                    {editorType === 'markup' && (
+                                        <MarkupEditorView
+                                            editor={editor}
+                                            autofocus={autofocus}
+                                            settingsVisible={settingsVisible}
+                                            toolbarConfig={markupToolbarConfig}
+                                            toolbarVisible={editor.toolbarVisible}
+                                            splitMode={editor.splitMode}
+                                            splitModeEnabled={editor.splitModeEnabled}
+                                            hiddenActionsConfig={markupHiddenActionsConfig}
+                                            className={b('editor', {type: editorType})}
+                                            toolbarClassName={b('toolbar')}
+                                            stickyToolbar={stickyToolbar}
+                                        >
+                                            {editor.toolbarVisible && settingsVisible && settings}
+                                        </MarkupEditorView>
+                                    )}
+                                    {!editor.toolbarVisible && settingsVisible && settings}
+                                </>
+                            )}
+                        </div>
+
+                        {markupSplitMode && (
+                            <>
+                                {editor.splitMode === 'horizontal' ? (
+                                    <HorizontalDrag
+                                        editor={editor}
+                                        isMounted={isMounted}
+                                        leftElRef={editorWrapperRef}
+                                        rightElRef={splitModeViewWrapperRef}
+                                        wrapperRef={divRef}
+                                    />
+                                ) : (
+                                    <div className={b('resizer')} />
+                                )}
+                                <SplitModeView editor={editor} ref={splitModeViewWrapperRef} />
+                            </>
+                        )}
+                    </div>
+                </ToasterContext.Provider>
+            </ErrorBoundary>
+        );
+    },
+);
+MarkdownEditorView.displayName = 'MarkdownEditorView';
+
+export function Settings(props: EditorSettingsProps & {stickyToolbar: boolean}) {
+    const wrapperRef = useRef<HTMLDivElement>(null);
+    const isSticky = useSticky(wrapperRef) && props.toolbarVisibility && props.stickyToolbar;
+    return (
+        <div className={b('settings-wrapper')}>
+            <div
+                ref={wrapperRef}
+                className={stickyCn.settings({
+                    withToolbar: props.toolbarVisibility,
+                    stickyActive: isSticky,
+                })}
+            >
+                <EditorSettings {...props} />
+            </div>
+        </div>
+    );
+}
+
+function isPreviewKeyDown(e: KeyboardEvent) {
+    const modKey = isMac() ? e.metaKey : e.ctrlKey;
+    return modKey && e.shiftKey && e.code === 'KeyP';
+}
diff --git a/src/bundle/MarkupEditorView.tsx b/src/bundle/MarkupEditorView.tsx
index 0a15d1ed..0bc452ab 100644
--- a/src/bundle/MarkupEditorView.tsx
+++ b/src/bundle/MarkupEditorView.tsx
@@ -85,4 +85,4 @@ export const MarkupEditorView = React.memo<MarkupEditorViewProps>((props) => {
         </div>
     );
 });
-MarkupEditorView.displayName = 'YfmMarkupEditorView';
+MarkupEditorView.displayName = 'MarkdownMarkupEditorView';
diff --git a/src/bundle/WysiwygEditorView.tsx b/src/bundle/WysiwygEditorView.tsx
index ebf55537..5ad6958d 100644
--- a/src/bundle/WysiwygEditorView.tsx
+++ b/src/bundle/WysiwygEditorView.tsx
@@ -69,4 +69,4 @@ export const WysiwygEditorView = React.memo<WysiwygEditorViewProps>((props) => {
         </div>
     );
 });
-WysiwygEditorView.displayName = 'YfmWysiwgEditorView';
+WysiwygEditorView.displayName = 'MarkdownWysiwgEditorView';
diff --git a/src/bundle/YfmEditorView.tsx b/src/bundle/YfmEditorView.tsx
deleted file mode 100644
index df5e4985..00000000
--- a/src/bundle/YfmEditorView.tsx
+++ /dev/null
@@ -1,282 +0,0 @@
-import React, {MutableRefObject, useEffect, useMemo, useRef, useState} from 'react';
-
-import type {ToasterPublicMethods} from '@gravity-ui/uikit';
-import {ErrorBoundary} from 'react-error-boundary';
-import {useEnsuredForwardedRef, useKey, useUpdate} from 'react-use';
-
-import {ClassNameProps, cn} from '../classname';
-import {i18n} from '../i18n/bundle';
-import {logger} from '../logger';
-import {useBooleanState} from '../react-utils/hooks';
-import {ToasterContext} from '../react-utils/toaster';
-import {useSticky} from '../react-utils/useSticky';
-import {isMac} from '../utils/platform';
-
-import type {Editor, EditorInt, EditorType} from './Editor';
-import {HorizontalDrag} from './HorizontalDrag';
-import {MarkupEditorView} from './MarkupEditorView';
-import {SplitModeView} from './SplitModeView';
-import {WysiwygEditorView} from './WysiwygEditorView';
-import {MToolbarData, MToolbarSingleItemData, mHiddenData, mToolbarConfig} from './config/markup';
-import {WToolbarData, WToolbarItemData, wHiddenData, wToolbarConfig} from './config/wysiwyg';
-import {useYfmEditorContext} from './context';
-import {EditorSettings, EditorSettingsProps} from './settings';
-import {stickyCn} from './sticky';
-
-import '../styles/styles.scss';
-import './YfmEditorView.scss'; // eslint-disable-line import/order
-
-export const cnEditorComponent = cn('editor-component');
-const b = cnEditorComponent;
-
-export type YfmEditorViewProps = ClassNameProps & {
-    editor?: Editor;
-    autofocus?: boolean;
-    markupToolbarConfig?: MToolbarData;
-    wysiwygToolbarConfig?: WToolbarData;
-    markupHiddenActionsConfig?: MToolbarSingleItemData[];
-    wysiwygHiddenActionsConfig?: WToolbarItemData[];
-    /** @default true */
-    settingsVisible?: boolean;
-    toaster: ToasterPublicMethods;
-    stickyToolbar: boolean;
-};
-
-export const YfmEditorView = React.forwardRef<HTMLDivElement, YfmEditorViewProps>((props, ref) => {
-    const divRef = useEnsuredForwardedRef(ref as MutableRefObject<HTMLDivElement>);
-
-    const [isMounted, setIsMounted] = useState(false);
-    useEffect(() => {
-        setIsMounted(true);
-    }, []);
-
-    const [showPreview, , unsetShowPreview, toggleShowPreview] = useBooleanState(false);
-
-    const context = useYfmEditorContext();
-    const editor = (props.editor ?? context) as EditorInt;
-    if (!editor)
-        throw new Error(
-            '[YfmEditorView]: an instance of the editor must be passed through the props or context',
-        );
-
-    const {
-        autofocus,
-        className,
-        settingsVisible = true,
-        markupToolbarConfig = mToolbarConfig,
-        wysiwygToolbarConfig = wToolbarConfig,
-        markupHiddenActionsConfig = mHiddenData,
-        wysiwygHiddenActionsConfig = wHiddenData,
-        toaster,
-        stickyToolbar,
-    } = props;
-
-    const rerender = useUpdate();
-    React.useLayoutEffect(() => {
-        editor.on('rerender', rerender);
-        return () => {
-            editor.off('rerender', rerender);
-        };
-    }, [editor, rerender]);
-
-    const onModeChange = React.useCallback(
-        (type: EditorType) => {
-            editor.changeEditorType({type, reason: 'settings'});
-            unsetShowPreview();
-        },
-        [editor, unsetShowPreview],
-    );
-    const onToolbarVisibilityChange = React.useCallback(
-        (visible: boolean) => {
-            editor.changeToolbarVisibility({visible});
-        },
-        [editor],
-    );
-    const onSplitModeChange = React.useCallback(
-        (splitModeEnabled: boolean) => {
-            unsetShowPreview();
-            editor.changeSplitModeEnabled({splitModeEnabled});
-        },
-        [editor, unsetShowPreview],
-    );
-
-    const onShowPreviewChange = React.useCallback(
-        (showPreviewValue: boolean) => {
-            editor.changeSplitModeEnabled({splitModeEnabled: false});
-            if (showPreviewValue !== showPreview) toggleShowPreview();
-        },
-        [editor, showPreview, toggleShowPreview],
-    );
-
-    const editorType = editor.currentType;
-    const markupSplitMode = editor.splitModeEnabled && editor.splitMode && editorType === 'markup';
-    const canRenderPreview = Boolean(
-        editor.renderPreview && editorType === 'markup' && !editor.splitModeEnabled,
-    );
-
-    useKey(
-        (e) => canRenderPreview && isPreviewKeyDown(e),
-        () => onShowPreviewChange(!showPreview),
-        {event: 'keydown'},
-        [showPreview, editorType, onShowPreviewChange, canRenderPreview],
-    );
-
-    const editorWrapperRef = useRef(null);
-    const splitModeViewWrapperRef = useRef(null);
-
-    const settings = useMemo(
-        () => (
-            <Settings
-                mode={editorType}
-                onModeChange={onModeChange}
-                toolbarVisibility={editor.toolbarVisible && !showPreview}
-                onToolbarVisibilityChange={onToolbarVisibilityChange}
-                onSplitModeChange={onSplitModeChange}
-                splitModeEnabled={editor.splitModeEnabled}
-                splitMode={editor.splitMode}
-                stickyToolbar={stickyToolbar}
-                onShowPreviewChange={onShowPreviewChange}
-                showPreview={showPreview}
-                renderPreviewButton={canRenderPreview}
-            />
-        ),
-        [
-            canRenderPreview,
-            stickyToolbar,
-            editor.splitMode,
-            editor.splitModeEnabled,
-            editor.toolbarVisible,
-            editorType,
-            onModeChange,
-            onShowPreviewChange,
-            onSplitModeChange,
-            onToolbarVisibilityChange,
-            showPreview,
-        ],
-    );
-
-    return (
-        <ErrorBoundary
-            onError={(e) => {
-                logger.error(e);
-            }}
-            fallbackRender={({error, resetErrorBoundary}) => {
-                toaster.add({
-                    theme: 'danger',
-                    name: 'yfm-editor',
-                    title: i18n('error-title'),
-                    content: error.message,
-                });
-                setTimeout(() => {
-                    resetErrorBoundary();
-                    editor.changeEditorType({type: 'markup', reason: 'error-boundary'});
-                });
-                return null;
-            }}
-        >
-            <ToasterContext.Provider value={toaster}>
-                <div
-                    ref={divRef}
-                    className={b(
-                        {
-                            settings: settingsVisible,
-                            split: markupSplitMode && editor.splitMode,
-                        },
-                        [className],
-                    )}
-                >
-                    <div className={b('editor-wrapper')} ref={editorWrapperRef}>
-                        {showPreview ? (
-                            <>
-                                <div className={b('preview-wrapper')}>
-                                    {editor.renderPreview?.({
-                                        getValue: editor.getValue,
-                                        mode: 'preview',
-                                    })}
-                                </div>
-                                {settings}
-                            </>
-                        ) : (
-                            <>
-                                {editorType === 'wysiwyg' && (
-                                    <WysiwygEditorView
-                                        editor={editor}
-                                        autofocus={autofocus}
-                                        settingsVisible={settingsVisible}
-                                        toolbarConfig={wysiwygToolbarConfig}
-                                        toolbarVisible={editor.toolbarVisible}
-                                        hiddenActionsConfig={wysiwygHiddenActionsConfig}
-                                        className={b('editor', {type: editorType})}
-                                        toolbarClassName={b('toolbar')}
-                                        stickyToolbar={stickyToolbar}
-                                    >
-                                        {editor.toolbarVisible && settingsVisible && settings}
-                                    </WysiwygEditorView>
-                                )}
-                                {editorType === 'markup' && (
-                                    <MarkupEditorView
-                                        editor={editor}
-                                        autofocus={autofocus}
-                                        settingsVisible={settingsVisible}
-                                        toolbarConfig={markupToolbarConfig}
-                                        toolbarVisible={editor.toolbarVisible}
-                                        splitMode={editor.splitMode}
-                                        splitModeEnabled={editor.splitModeEnabled}
-                                        hiddenActionsConfig={markupHiddenActionsConfig}
-                                        className={b('editor', {type: editorType})}
-                                        toolbarClassName={b('toolbar')}
-                                        stickyToolbar={stickyToolbar}
-                                    >
-                                        {editor.toolbarVisible && settingsVisible && settings}
-                                    </MarkupEditorView>
-                                )}
-                                {!editor.toolbarVisible && settingsVisible && settings}
-                            </>
-                        )}
-                    </div>
-
-                    {markupSplitMode && (
-                        <>
-                            {editor.splitMode === 'horizontal' ? (
-                                <HorizontalDrag
-                                    editor={editor}
-                                    isMounted={isMounted}
-                                    leftElRef={editorWrapperRef}
-                                    rightElRef={splitModeViewWrapperRef}
-                                    wrapperRef={divRef}
-                                />
-                            ) : (
-                                <div className={b('resizer')} />
-                            )}
-                            <SplitModeView editor={editor} ref={splitModeViewWrapperRef} />
-                        </>
-                    )}
-                </div>
-            </ToasterContext.Provider>
-        </ErrorBoundary>
-    );
-});
-YfmEditorView.displayName = 'YfmEditorView';
-
-export function Settings(props: EditorSettingsProps & {stickyToolbar: boolean}) {
-    const wrapperRef = useRef<HTMLDivElement>(null);
-    const isSticky = useSticky(wrapperRef) && props.toolbarVisibility && props.stickyToolbar;
-    return (
-        <div className={b('settings-wrapper')}>
-            <div
-                ref={wrapperRef}
-                className={stickyCn.settings({
-                    withToolbar: props.toolbarVisibility,
-                    stickyActive: isSticky,
-                })}
-            >
-                <EditorSettings {...props} />
-            </div>
-        </div>
-    );
-}
-
-function isPreviewKeyDown(e: KeyboardEvent) {
-    const modKey = isMac() ? e.metaKey : e.ctrlKey;
-    return modKey && e.shiftKey && e.code === 'KeyP';
-}
diff --git a/src/bundle/context.ts b/src/bundle/context.ts
index 844c3f7d..ddfacab7 100644
--- a/src/bundle/context.ts
+++ b/src/bundle/context.ts
@@ -4,7 +4,7 @@ import {Editor} from './Editor';
 
 const EditorContext = createContext<Editor | null>(null);
 
-export const YfmEditorProvider = EditorContext.Provider;
-export function useYfmEditorContext() {
+export const MarkdownEditorProvider = EditorContext.Provider;
+export function useMarkdownEditorContext() {
     return useContext(EditorContext);
 }
diff --git a/src/bundle/index.ts b/src/bundle/index.ts
index 9191dfa2..5fb86a74 100644
--- a/src/bundle/index.ts
+++ b/src/bundle/index.ts
@@ -1,8 +1,8 @@
 export type {ExtensionsOptions} from './wysiwyg-preset';
-export type {Editor, EditorType as YfmEditorType, RenderPreview, SplitMode} from './Editor';
+export type {Editor, EditorType as MarkdownEditorType, RenderPreview, SplitMode} from './Editor';
 export * from './context';
-export * from './useYfmEditor';
-export * from './YfmEditorView';
+export * from './useMarkdownEditor';
+export * from './MarkdownEditorView';
 
 // For project that do not support star export (export * as something from '...')
 import * as markupToolbarConfigs from './config/markup';
diff --git a/src/bundle/useYfmEditor.ts b/src/bundle/useMarkdownEditor.ts
similarity index 93%
rename from src/bundle/useYfmEditor.ts
rename to src/bundle/useMarkdownEditor.ts
index 09aad3d4..1109da0c 100644
--- a/src/bundle/useYfmEditor.ts
+++ b/src/bundle/useMarkdownEditor.ts
@@ -7,7 +7,7 @@ import {logger} from '../logger';
 import {Editor, EditorImpl, EditorInt, EditorOptions, EditorType} from './Editor';
 import {BundlePreset, ExtensionsOptions} from './wysiwyg-preset';
 
-export type UseYfmEditorProps<T extends object = {}> = Omit<
+export type UseMarkdownEditorProps<T extends object = {}> = Omit<
     EditorOptions,
     'extensions' | 'renderStorage'
 > & {
@@ -18,8 +18,8 @@ export type UseYfmEditorProps<T extends object = {}> = Omit<
     extraExtensions?: Extension;
 };
 
-export function useYfmEditor<T extends object = {}>(
-    props: UseYfmEditorProps<T>,
+export function useMarkdownEditor<T extends object = {}>(
+    props: UseMarkdownEditorProps<T>,
     deps: React.DependencyList = [],
 ): Editor {
     const editor = useMemo<EditorInt>(