diff --git a/.changeset/README.md b/.changeset/README.md
index ba85766e..8399ca86 100644
--- a/.changeset/README.md
+++ b/.changeset/README.md
@@ -4,6 +4,6 @@ This folder is managed by [Changesets](https://github.com/changesets/changesets)
 
 - **Add a changeset** for your change: `npm run changeset` (or `yarn`/`pnpm`/`gjsify run changeset`). Pick the affected packages and the bump type, write a one-line summary. Commit the generated `.changeset/*.md` with your PR.
 - All `@learn6502/*` packages are **version-locked** (`fixed` group) — they bump together, keeping the internal `^x.y.z` ranges consistent. Changesets rewrites those internal ranges automatically on `version`, so you never hand-sync them.
-- Only **`@learn6502/6502`** is published to npm; the other packages are `private` (they still get versioned + changelogged, just not published).
+- Only **`@learn6502/core`** is published to npm; the other packages are `private` (they still get versioned + changelogged, just not published).
 
 Release flow (maintainer): `npm run changeset:version` (applies pending changesets → bumps versions + internal ranges + writes CHANGELOGs), commit, then `npm run changeset:publish` (builds + `changeset publish`).
diff --git a/.cursor/rules/package-app-android.mdc b/.cursor/rules/package-app-android.mdc
index f0977ff9..6056899f 100644
--- a/.cursor/rules/package-app-android.mdc
+++ b/.cursor/rules/package-app-android.mdc
@@ -43,7 +43,7 @@ Android app with deep platform integration.
 **Architecture Patterns:**
 
 - **Services:** Centralized services in `app/services/` (lifecycle, theme, notification)
-- **State Management:** Reactive state with `EventDispatcher` from `@learn6502/6502`
+- **State Management:** Reactive state with `EventDispatcher` from `@learn6502/core`
 - **Views:** Implement interfaces from `@learn6502/common-ui` (e.g., `MainView`, `GameConsoleView`, `DebuggerView`)
 - **Widgets:** Reusable UI components in `app/widgets/` wrapping native Android widgets
 - **Utils:** Platform-specific utilities in `app/utils/` (system, navigation, logger, resource helpers)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8cf0b251..67f2ef82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,19 +85,19 @@ jobs:
       - name: Install dependencies
         run: gjsify install --immutable
 
-      # Build the workspace deps that publish built output (`@learn6502/6502`,
+      # Build the workspace deps that publish built output (`@learn6502/core`,
       # `examples`, `learn` ship `dist/*.d.ts`; `common-ui` exports source).
       # Without this, type-checking common-ui/app-* fails with TS2307 "Cannot
-      # find module '@learn6502/6502'" — its types only exist after a build.
+      # find module '@learn6502/core'" — its types only exist after a build.
       - name: Build workspace dependencies
         run: |
-          gjsify workspace @learn6502/6502 build
+          gjsify workspace @learn6502/core build
           gjsify workspace @learn6502/examples build
           gjsify workspace @learn6502/learn build
 
       - name: Type check (gjsify tsc under GJS)
         run: |
-          gjsify workspace @learn6502/6502 check
+          gjsify workspace @learn6502/core check
           gjsify workspace @learn6502/common-ui check
           gjsify workspace @learn6502/app-web check
           gjsify workspace @learn6502/app-gnome check:typescript
diff --git a/.github/workflows/issue-to-pr.yml b/.github/workflows/issue-to-pr.yml
index c020e1eb..fcde8bde 100644
--- a/.github/workflows/issue-to-pr.yml
+++ b/.github/workflows/issue-to-pr.yml
@@ -74,7 +74,7 @@ jobs:
 
           # Build the TypeScript file content
           {
-            echo 'import { _ } from "@learn6502/6502";'
+            echo 'import { _ } from "@learn6502/core";'
             echo 'import type { ExampleMetaJson } from "../example-meta.ts";'
             echo 'export default {'
             echo "  slug: \"$(esc "$SLUG")\","
diff --git a/.github/workflows/package-managers.yml b/.github/workflows/package-managers.yml
index f1a42d21..afe4935a 100644
--- a/.github/workflows/package-managers.yml
+++ b/.github/workflows/package-managers.yml
@@ -64,12 +64,12 @@ jobs:
           sh -c "$INSTALL"
 
       - name: Verify workspace resolution (build 6502 → type-check common-ui)
-        # common-ui imports @learn6502/6502; this only type-checks if the PM
+        # common-ui imports @learn6502/core; this only type-checks if the PM
         # symlinked the workspace + resolved the internal `^x.y.z` range to the
         # local package. The lightest decisive cross-workspace check (gjs only,
         # no GTK build deps). The full app-gnome build is covered by flatpak.yml.
         run: |
           set -eux
           export PATH="$PWD/node_modules/.bin:$PATH"
-          gjsify workspace @learn6502/6502 build
+          gjsify workspace @learn6502/core build
           gjsify workspace @learn6502/common-ui check
diff --git a/AGENTS.md b/AGENTS.md
index 16056ac8..3ccbb1c4 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -291,7 +291,7 @@ Required for R8/ProGuard code shrinking. Missing entries cause **runtime crashes
 ### Architecture
 
 - Services: `app/services/` (lifecycle, theme, notification)
-- State: reactive with `EventDispatcher` from `@learn6502/6502`
+- State: reactive with `EventDispatcher` from `@learn6502/core`
 - Views: implement interfaces from `@learn6502/common-ui`
 - Widgets: `app/widgets/` wrapping native Android widgets
 - Utils: `app/utils/` (system, navigation, logger, resources)
diff --git a/README.md b/README.md
index 3e100946..c64a3579 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ To run the packages, run `gjsify run start:gnome` for the GNOME app or `gjsify r
 
 ### Releasing
 
-Versioning, changelogs and npm publishing are managed with [Changesets](https://github.com/changesets/changesets) (see [`.changeset/README.md`](.changeset/README.md)). Add a changeset with your change (`gjsify run changeset`, or `npm`/`yarn`/`pnpm run changeset`). All `@learn6502/*` packages are version-locked and bump together; only `@learn6502/6502` is published to npm (the rest are private). Maintainer release: `… run changeset:version` then `… run changeset:publish`.
+Versioning, changelogs and npm publishing are managed with [Changesets](https://github.com/changesets/changesets) (see [`.changeset/README.md`](.changeset/README.md)). Add a changeset with your change (`gjsify run changeset`, or `npm`/`yarn`/`pnpm run changeset`). All `@learn6502/*` packages are version-locked and bump together; only `@learn6502/core` is published to npm (the rest are private). Maintainer release: `… run changeset:version` then `… run changeset:publish`.
 
 ## Contributing
 
diff --git a/package.json b/package.json
index dca24310..886c4c98 100644
--- a/package.json
+++ b/package.json
@@ -407,7 +407,7 @@
     "check:lint": "gjsify lint",
     "changeset": "changeset",
     "changeset:version": "changeset version",
-    "changeset:publish": "gjsify workspace @learn6502/6502 build && changeset publish"
+    "changeset:publish": "gjsify workspace @learn6502/core build && changeset publish"
   },
   "author": "Pascal Garber <pascal@mailfreun.de>",
   "license": "GPL-3.0",
diff --git a/packages/6502/package.json b/packages/6502/package.json
index 62122465..4b4eb19a 100644
--- a/packages/6502/package.json
+++ b/packages/6502/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@learn6502/6502",
+  "name": "@learn6502/core",
   "version": "0.7.0",
   "description": "6502 assembler and simulator in Javascript",
   "main": "dist/index.js",
diff --git a/packages/app-android/app/mdx/mdx-view.ts b/packages/app-android/app/mdx/mdx-view.ts
index 00dc4c32..2277c780 100644
--- a/packages/app-android/app/mdx/mdx-view.ts
+++ b/packages/app-android/app/mdx/mdx-view.ts
@@ -1,7 +1,7 @@
 import type { View } from "@nativescript/core";
 import { ContentView, Builder, HtmlView } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
-import { EventDispatcher } from "@learn6502/6502";
+import { EventDispatcher } from "@learn6502/core";
 import type { SourceViewEventMap, SourceViewCopyEvent } from "@learn6502/common-ui";
 import { SourceView } from "~/widgets/source-view";
 import { logger } from "~/utils";
diff --git a/packages/app-android/app/states/system.states.ts b/packages/app-android/app/states/system.states.ts
index ccafe508..2bf690c9 100644
--- a/packages/app-android/app/states/system.states.ts
+++ b/packages/app-android/app/states/system.states.ts
@@ -11,7 +11,7 @@
 import type { LaunchEventData } from "@nativescript/core";
 import { Application, type SystemAppearanceChangedEventData, Utils } from "@nativescript/core";
 import { androidLaunchEventLocalizationHandler, overrideLocale } from "@nativescript/localize";
-import { EventDispatcher } from "@learn6502/6502";
+import { EventDispatcher } from "@learn6502/core";
 import { ContrastMode } from "../constants";
 // Direct imports to avoid circular dependency (utils/index → color → system.states → utils/index)
 import { contrastLevelToMode } from "../utils/contrast";
diff --git a/packages/app-android/app/views/main.ts b/packages/app-android/app/views/main.ts
index a52c803b..eced1028 100644
--- a/packages/app-android/app/views/main.ts
+++ b/packages/app-android/app/views/main.ts
@@ -17,7 +17,7 @@ import {
   MainEventBridge,
   MainButtonState,
 } from "@learn6502/common-ui";
-import type { SimulatorState } from "@learn6502/6502";
+import type { SimulatorState } from "@learn6502/core";
 
 // Import services
 import { notificationService } from "~/services";
diff --git a/packages/app-android/app/views/main/debugger.ts b/packages/app-android/app/views/main/debugger.ts
index 3f2f3783..149a588c 100644
--- a/packages/app-android/app/views/main/debugger.ts
+++ b/packages/app-android/app/views/main/debugger.ts
@@ -8,7 +8,7 @@ import {
   editorController,
   ViewType,
 } from "@learn6502/common-ui";
-import type { Memory, Simulator, Assembler } from "@learn6502/6502";
+import type { Memory, Simulator, Assembler } from "@learn6502/core";
 
 // Import custom widgets
 import type { MessageConsole, DebugInfo, HexMonitor, Hexdump, Disassembled } from "~/widgets/debugger";
diff --git a/packages/app-android/app/views/main/editor.ts b/packages/app-android/app/views/main/editor.ts
index bd8c9863..4354a970 100644
--- a/packages/app-android/app/views/main/editor.ts
+++ b/packages/app-android/app/views/main/editor.ts
@@ -3,7 +3,7 @@ import { Observable } from "@nativescript/core";
 import type { EditorView, EditorEventMap } from "@learn6502/common-ui";
 import { editorController } from "@learn6502/common-ui";
 import type { SourceView } from "~/widgets/source-view";
-import { EventDispatcher } from "@learn6502/6502";
+import { EventDispatcher } from "@learn6502/core";
 import { logger } from "~/utils";
 
 /**
diff --git a/packages/app-android/app/views/main/game-console.ts b/packages/app-android/app/views/main/game-console.ts
index 9b865ad9..5c4feafa 100644
--- a/packages/app-android/app/views/main/game-console.ts
+++ b/packages/app-android/app/views/main/game-console.ts
@@ -1,6 +1,6 @@
 import type { EventData, Page } from "@nativescript/core";
-import type { SimulatorState } from "@learn6502/6502";
-import { type Memory, type Labels, type Simulator, type Assembler } from "@learn6502/6502";
+import type { SimulatorState } from "@learn6502/core";
+import { type Memory, type Labels, type Simulator, type Assembler } from "@learn6502/core";
 
 // Import child widgets
 import type { Display, Gamepad } from "~/widgets/game-console";
diff --git a/packages/app-android/app/widgets/debugger/debug-info.ts b/packages/app-android/app/widgets/debugger/debug-info.ts
index fee7aeb7..7950f737 100644
--- a/packages/app-android/app/widgets/debugger/debug-info.ts
+++ b/packages/app-android/app/widgets/debugger/debug-info.ts
@@ -1,7 +1,7 @@
 import { ContentView, Builder } from "@nativescript/core";
 import type { DebugInfoWidget } from "@learn6502/common-ui";
-import type { Simulator } from "@learn6502/6502";
-import { num2hex, addr2hex } from "@learn6502/6502";
+import type { Simulator } from "@learn6502/core";
+import { num2hex, addr2hex } from "@learn6502/core";
 import type { ListItem } from "../list-item";
 import { logger } from "~/utils";
 
diff --git a/packages/app-android/app/widgets/debugger/disassembled.ts b/packages/app-android/app/widgets/debugger/disassembled.ts
index 0da5186b..2150f5d5 100644
--- a/packages/app-android/app/widgets/debugger/disassembled.ts
+++ b/packages/app-android/app/widgets/debugger/disassembled.ts
@@ -1,7 +1,7 @@
 import { TextView } from "@nativescript/core";
 import type { DisassembledWidget, DisassembledEventMap } from "@learn6502/common-ui";
-import type { Assembler } from "@learn6502/6502";
-import { EventDispatcher } from "@learn6502/6502";
+import type { Assembler } from "@learn6502/core";
+import { EventDispatcher } from "@learn6502/core";
 
 export class Disassembled extends TextView implements DisassembledWidget {
   readonly events = new EventDispatcher<DisassembledEventMap>();
diff --git a/packages/app-android/app/widgets/debugger/hex-monitor.ts b/packages/app-android/app/widgets/debugger/hex-monitor.ts
index 20b4d960..d3ae5c2b 100644
--- a/packages/app-android/app/widgets/debugger/hex-monitor.ts
+++ b/packages/app-android/app/widgets/debugger/hex-monitor.ts
@@ -2,8 +2,8 @@ import type { GridLayout } from "@nativescript/core";
 import { Label, ScrollView } from "@nativescript/core";
 import type { HexMonitorWidget, HexMonitorOptions, MemoryRegion, HexMonitorEventMap } from "@learn6502/common-ui";
 import { memoryRegions } from "@learn6502/common-ui";
-import type { Memory } from "@learn6502/6502";
-import { EventDispatcher, num2hex, addr2hex } from "@learn6502/6502";
+import type { Memory } from "@learn6502/core";
+import { EventDispatcher, num2hex, addr2hex } from "@learn6502/core";
 import { logger } from "~/utils";
 
 export class HexMonitor extends ScrollView implements HexMonitorWidget {
diff --git a/packages/app-android/app/widgets/debugger/hexdump.ts b/packages/app-android/app/widgets/debugger/hexdump.ts
index a6e6b817..646963cd 100644
--- a/packages/app-android/app/widgets/debugger/hexdump.ts
+++ b/packages/app-android/app/widgets/debugger/hexdump.ts
@@ -1,7 +1,7 @@
 import { TextView } from "@nativescript/core";
 import type { HexdumpWidget, HexdumpEventMap } from "@learn6502/common-ui";
-import type { Assembler } from "@learn6502/6502";
-import { EventDispatcher } from "@learn6502/6502";
+import type { Assembler } from "@learn6502/core";
+import { EventDispatcher } from "@learn6502/core";
 
 export class Hexdump extends TextView implements HexdumpWidget {
   readonly events = new EventDispatcher<HexdumpEventMap>();
diff --git a/packages/app-android/app/widgets/game-console/display.ts b/packages/app-android/app/widgets/game-console/display.ts
index e9fb0c09..278927ff 100644
--- a/packages/app-android/app/widgets/game-console/display.ts
+++ b/packages/app-android/app/widgets/game-console/display.ts
@@ -10,8 +10,8 @@ import {
   CoreTypes,
 } from "@nativescript/core";
 import { isAndroid } from "@nativescript/core";
-import type { Memory } from "@learn6502/6502";
-import { DisplayAddressRange } from "@learn6502/6502";
+import type { Memory } from "@learn6502/core";
+import { DisplayAddressRange } from "@learn6502/core";
 import { logger } from "~/utils";
 
 /**
diff --git a/packages/app-android/app/widgets/game-console/gamepad.ts b/packages/app-android/app/widgets/game-console/gamepad.ts
index 2907c3b7..580b9456 100644
--- a/packages/app-android/app/widgets/game-console/gamepad.ts
+++ b/packages/app-android/app/widgets/game-console/gamepad.ts
@@ -2,7 +2,7 @@ import type { Button } from "@nativescript/core";
 import { GridLayout, Builder } from "@nativescript/core";
 import type { GamepadKey, GamepadEventMap, GamepadWidget } from "@learn6502/common-ui";
 import { getGamepadKeyCode, getGamepadKeyChar } from "@learn6502/common-ui";
-import { EventDispatcher } from "@learn6502/6502";
+import { EventDispatcher } from "@learn6502/core";
 import { logger } from "~/utils";
 
 /**
diff --git a/packages/app-android/app/widgets/main-button.ts b/packages/app-android/app/widgets/main-button.ts
index 60292970..6aca8b0c 100644
--- a/packages/app-android/app/widgets/main-button.ts
+++ b/packages/app-android/app/widgets/main-button.ts
@@ -1,7 +1,7 @@
 import type { EventData } from "@nativescript/core";
 import { Property, CSSType } from "@nativescript/core";
 import { localize as _ } from "@nativescript/localize";
-import type { SimulatorState } from "@learn6502/6502"; // Import shared simulator state
+import type { SimulatorState } from "@learn6502/core"; // Import shared simulator state
 import { Fab } from "./fab"; // Import the base Fab class
 import {
   MainButtonState,
diff --git a/packages/app-android/app/widgets/source-view.ts b/packages/app-android/app/widgets/source-view.ts
index 2053ad45..dbe02bf5 100644
--- a/packages/app-android/app/widgets/source-view.ts
+++ b/packages/app-android/app/widgets/source-view.ts
@@ -1,6 +1,6 @@
 import type { TextView, Button } from "@nativescript/core";
 import { ContentView, Property, Builder, booleanConverter, Color } from "@nativescript/core";
-import { debounce, EventDispatcher } from "@learn6502/6502";
+import { debounce, EventDispatcher } from "@learn6502/core";
 import type { SourceViewEventMap, SourceViewWidget } from "@learn6502/common-ui";
 import { OPCODE_PATTERN, COMMENT_PATTERN, HEX_VALUE_PATTERN } from "@learn6502/common-ui";
 import { logger } from "~/utils";
diff --git a/packages/app-android/package.json b/packages/app-android/package.json
index d8606aa1..5093a6f9 100644
--- a/packages/app-android/package.json
+++ b/packages/app-android/package.json
@@ -12,7 +12,7 @@
     "check": "gjsify tsc --noEmit"
   },
   "dependencies": {
-    "@learn6502/6502": "^0.7.0",
+    "@learn6502/core": "^0.7.0",
     "@learn6502/common-ui": "^0.7.0",
     "@nativescript/core": "~9.0.20",
     "@nativescript/localize": "^5.2.0",
diff --git a/packages/app-gnome/README.md b/packages/app-gnome/README.md
index a53e9227..127ac3e7 100644
--- a/packages/app-gnome/README.md
+++ b/packages/app-gnome/README.md
@@ -35,7 +35,7 @@ The application depends on several GNOME libraries and internal packages:
 
 - GNOME libraries (GJS, GTK, Adwaita, etc.)
 - Internal packages:
-  - `@learn6502/6502`: 6502 simulator and assembler
+  - `@learn6502/core`: 6502 simulator and assembler
   - `@learn6502/learn`: Tutorial content
   - `@learn6502/translations`: Localization support
 
diff --git a/packages/app-gnome/package.json b/packages/app-gnome/package.json
index 1b9aa98d..68dfebd5 100644
--- a/packages/app-gnome/package.json
+++ b/packages/app-gnome/package.json
@@ -128,7 +128,7 @@
     "@girs/pango-1.0": "1.57.1-4.0.4",
     "@girs/webkit-6.0": "2.52.1-4.0.4",
     "@gjsify/storybook": "^0.10.0",
-    "@learn6502/6502": "^0.7.0",
+    "@learn6502/core": "^0.7.0",
     "@learn6502/common-ui": "^0.7.0",
     "@learn6502/learn": "^0.7.0",
     "@learn6502/translations": "^0.7.0"
diff --git a/packages/app-gnome/src/views/main.window.ts b/packages/app-gnome/src/views/main.window.ts
index b1639b13..3d28818f 100644
--- a/packages/app-gnome/src/views/main.window.ts
+++ b/packages/app-gnome/src/views/main.window.ts
@@ -5,7 +5,7 @@ import Gdk from "@girs/gdk-4.0";
 import Gio from "@girs/gio-2.0";
 import GLib from "@girs/glib-2.0";
 
-import { SimulatorState, num2hex, debounce } from "@learn6502/6502";
+import { SimulatorState, num2hex, debounce } from "@learn6502/core";
 
 import type { Learn, Editor, GameConsole, Debugger } from "./main";
 import { HelpWindow } from "./help.window.ts";
diff --git a/packages/app-gnome/src/views/main/debugger.ts b/packages/app-gnome/src/views/main/debugger.ts
index d4ec796a..259d08a0 100644
--- a/packages/app-gnome/src/views/main/debugger.ts
+++ b/packages/app-gnome/src/views/main/debugger.ts
@@ -6,8 +6,8 @@ import type { HexMonitor, Hexdump, Disassembled } from "../../widgets/debugger/i
 
 import Template from "./debugger.blp";
 
-import type { Assembler } from "@learn6502/6502";
-import { type Memory, type Simulator } from "@learn6502/6502";
+import type { Assembler } from "@learn6502/core";
+import { type Memory, type Simulator } from "@learn6502/core";
 import {
   type DebuggerView,
   type MessageConsoleWidget,
diff --git a/packages/app-gnome/src/views/main/editor.ts b/packages/app-gnome/src/views/main/editor.ts
index aedc02ab..20cd5996 100644
--- a/packages/app-gnome/src/views/main/editor.ts
+++ b/packages/app-gnome/src/views/main/editor.ts
@@ -4,7 +4,7 @@ import type Gtk from "@girs/gtk-4.0";
 import type GtkSource from "@girs/gtksource-5";
 import type { SourceView } from "../../widgets/source-view.ts";
 import type { QuickHelpView } from "../../mdx/quick-help-view.ts";
-import { EventDispatcher } from "@learn6502/6502";
+import { EventDispatcher } from "@learn6502/core";
 import type { EditorView, EditorEventMap } from "@learn6502/common-ui";
 import { editorController } from "@learn6502/common-ui";
 
diff --git a/packages/app-gnome/src/views/main/game-console.ts b/packages/app-gnome/src/views/main/game-console.ts
index 872ad426..53809130 100644
--- a/packages/app-gnome/src/views/main/game-console.ts
+++ b/packages/app-gnome/src/views/main/game-console.ts
@@ -1,7 +1,7 @@
 import GObject from "@girs/gobject-2.0";
 import Adw from "@girs/adw-1";
 
-import type { Memory, Labels, Simulator, Assembler } from "@learn6502/6502";
+import type { Memory, Labels, Simulator, Assembler } from "@learn6502/core";
 
 import type { Display, Gamepad } from "../../widgets/game-console/index.ts";
 import {
diff --git a/packages/app-gnome/src/widgets/debugger/debug-info.ts b/packages/app-gnome/src/widgets/debugger/debug-info.ts
index fd7651fa..887d0d24 100644
--- a/packages/app-gnome/src/widgets/debugger/debug-info.ts
+++ b/packages/app-gnome/src/widgets/debugger/debug-info.ts
@@ -2,7 +2,7 @@ import GObject from "@girs/gobject-2.0";
 import Adw from "@girs/adw-1";
 import type Gtk from "@girs/gtk-4.0";
 
-import { type Simulator, num2hex, addr2hex } from "@learn6502/6502";
+import { type Simulator, num2hex, addr2hex } from "@learn6502/core";
 import { type DebugInfoWidget } from "@learn6502/common-ui";
 import Template from "./debug-info.blp";
 
diff --git a/packages/app-gnome/src/widgets/debugger/disassembled.ts b/packages/app-gnome/src/widgets/debugger/disassembled.ts
index 9171698f..f385e09a 100644
--- a/packages/app-gnome/src/widgets/debugger/disassembled.ts
+++ b/packages/app-gnome/src/widgets/debugger/disassembled.ts
@@ -2,7 +2,7 @@ import GObject from "@girs/gobject-2.0";
 import Adw from "@girs/adw-1";
 import type { SourceView } from "../source-view.ts";
 
-import { type Assembler, EventDispatcher } from "@learn6502/6502";
+import { type Assembler, EventDispatcher } from "@learn6502/core";
 import type { DisassembledEventMap, DisassembledWidget, SourceViewCopyEvent } from "@learn6502/common-ui";
 
 import Template from "./disassembled.blp";
diff --git a/packages/app-gnome/src/widgets/debugger/hex-monitor.ts b/packages/app-gnome/src/widgets/debugger/hex-monitor.ts
index e69847a3..69f52be8 100644
--- a/packages/app-gnome/src/widgets/debugger/hex-monitor.ts
+++ b/packages/app-gnome/src/widgets/debugger/hex-monitor.ts
@@ -3,7 +3,7 @@ import Adw from "@girs/adw-1";
 import type Gtk from "@girs/gtk-4.0";
 import type { SourceView } from "../source-view.ts";
 
-import { EventDispatcher, type Memory } from "@learn6502/6502";
+import { EventDispatcher, type Memory } from "@learn6502/core";
 import {
   type HexMonitorOptions,
   type HexMonitorWidget,
diff --git a/packages/app-gnome/src/widgets/debugger/hexdump.ts b/packages/app-gnome/src/widgets/debugger/hexdump.ts
index 1c9b9b61..e646e159 100644
--- a/packages/app-gnome/src/widgets/debugger/hexdump.ts
+++ b/packages/app-gnome/src/widgets/debugger/hexdump.ts
@@ -2,7 +2,7 @@ import GObject from "@girs/gobject-2.0";
 import Adw from "@girs/adw-1";
 import type { SourceView } from "../source-view.ts";
 
-import { type Assembler, EventDispatcher } from "@learn6502/6502";
+import { type Assembler, EventDispatcher } from "@learn6502/core";
 import { type HexdumpWidget, type HexdumpEventMap, type SourceViewCopyEvent } from "@learn6502/common-ui";
 
 import Template from "./hexdump.blp";
diff --git a/packages/app-gnome/src/widgets/example-list-item.ts b/packages/app-gnome/src/widgets/example-list-item.ts
index bf77e442..582db319 100644
--- a/packages/app-gnome/src/widgets/example-list-item.ts
+++ b/packages/app-gnome/src/widgets/example-list-item.ts
@@ -2,7 +2,7 @@ import GObject from "@girs/gobject-2.0";
 import Gtk from "@girs/gtk-4.0";
 
 import type { ExampleMeta } from "@learn6502/examples";
-import { Memory, DisplayAddressRange } from "@learn6502/6502";
+import { Memory, DisplayAddressRange } from "@learn6502/core";
 import type { SourceView } from "./source-view.ts";
 import type { Display } from "./game-console/display.ts";
 
diff --git a/packages/app-gnome/src/widgets/game-console/display.ts b/packages/app-gnome/src/widgets/game-console/display.ts
index 71a2e7d3..dd94ce98 100644
--- a/packages/app-gnome/src/widgets/game-console/display.ts
+++ b/packages/app-gnome/src/widgets/game-console/display.ts
@@ -6,7 +6,7 @@ import Template from "./display.blp";
 
 import { type DisplayWidget, gameConsoleStateService } from "@learn6502/common-ui";
 import { DEFAULT_DISPLAY_CONFIG } from "@learn6502/common-ui/src/data/display-constants";
-import { type Memory, DisplayAddressRange } from "@learn6502/6502";
+import { type Memory, DisplayAddressRange } from "@learn6502/core";
 
 export class Display extends Adw.Bin implements DisplayWidget {
   // Child widgets
diff --git a/packages/app-gnome/src/widgets/game-console/gamepad.ts b/packages/app-gnome/src/widgets/game-console/gamepad.ts
index 3e483fd6..4ae97e0e 100644
--- a/packages/app-gnome/src/widgets/game-console/gamepad.ts
+++ b/packages/app-gnome/src/widgets/game-console/gamepad.ts
@@ -4,7 +4,7 @@ import Gtk from "@girs/gtk-4.0";
 import { type GamepadKey, type GamepadWidget, type GamepadEventMap, getGamepadKeyCode } from "@learn6502/common-ui";
 
 import Template from "./gamepad.blp";
-import { EventDispatcher } from "@learn6502/6502";
+import { EventDispatcher } from "@learn6502/core";
 
 export class Gamepad extends Adw.Bin implements GamepadWidget {
   readonly events: EventDispatcher<GamepadEventMap> = new EventDispatcher<GamepadEventMap>();
diff --git a/packages/app-gnome/src/widgets/main-button.ts b/packages/app-gnome/src/widgets/main-button.ts
index 1e60349e..3a84ff9d 100644
--- a/packages/app-gnome/src/widgets/main-button.ts
+++ b/packages/app-gnome/src/widgets/main-button.ts
@@ -2,7 +2,7 @@ import GObject from "@girs/gobject-2.0";
 import Adw from "@girs/adw-1";
 import type Gtk from "@girs/gtk-4.0";
 
-import type { SimulatorState } from "@learn6502/6502";
+import type { SimulatorState } from "@learn6502/core";
 import {
   MainButtonState,
   type MainButtonMode,
diff --git a/packages/app-gnome/src/widgets/share-dialog.ts b/packages/app-gnome/src/widgets/share-dialog.ts
index 1373d221..91155c03 100644
--- a/packages/app-gnome/src/widgets/share-dialog.ts
+++ b/packages/app-gnome/src/widgets/share-dialog.ts
@@ -5,8 +5,8 @@ import Gdk from "@girs/gdk-4.0";
 import GLib from "@girs/glib-2.0";
 
 import type { ExampleMeta } from "@learn6502/examples";
-import type { Memory } from "@learn6502/6502";
-import { DisplayAddressRange } from "@learn6502/6502";
+import type { Memory } from "@learn6502/core";
+import { DisplayAddressRange } from "@learn6502/core";
 import type { ExampleListItem } from "./example-list-item.ts";
 import { copyToClipboard } from "../utils.ts";
 
diff --git a/packages/app-gnome/src/widgets/source-view.ts b/packages/app-gnome/src/widgets/source-view.ts
index b4eb0389..a2d73f96 100644
--- a/packages/app-gnome/src/widgets/source-view.ts
+++ b/packages/app-gnome/src/widgets/source-view.ts
@@ -11,7 +11,7 @@ import Template from "./source-view.blp";
 import { GutterRendererLineNumbers } from "../gutter-renderer-line-numbers.ts";
 import { GutterRendererMode } from "../types/index.ts";
 import type { SourceViewWidget, SourceViewEventMap } from "@learn6502/common-ui";
-import { EventDispatcher } from "@learn6502/6502";
+import { EventDispatcher } from "@learn6502/core";
 
 GtkSource.init();
 
diff --git a/packages/app-web/package.json b/packages/app-web/package.json
index 096f4743..477a42ef 100644
--- a/packages/app-web/package.json
+++ b/packages/app-web/package.json
@@ -24,6 +24,6 @@
     "vite": "^8.0.16"
   },
   "dependencies": {
-    "@learn6502/6502": "^0.7.0"
+    "@learn6502/core": "^0.7.0"
   }
 }
diff --git a/packages/app-web/src/debugger.ts b/packages/app-web/src/debugger.ts
index 99f0e712..eadca9f5 100644
--- a/packages/app-web/src/debugger.ts
+++ b/packages/app-web/src/debugger.ts
@@ -1,5 +1,5 @@
-import type { Simulator, Memory, Assembler } from "@learn6502/6502";
-import { addr2hex, num2hex, throttle } from "@learn6502/6502";
+import type { Simulator, Memory, Assembler } from "@learn6502/core";
+import { addr2hex, num2hex, throttle } from "@learn6502/core";
 
 import {
   DebuggerState,
diff --git a/packages/app-web/src/display.ts b/packages/app-web/src/display.ts
index 34a669f1..73aa54e4 100644
--- a/packages/app-web/src/display.ts
+++ b/packages/app-web/src/display.ts
@@ -1,4 +1,4 @@
-import { type Memory, DisplayAddressRange } from "@learn6502/6502";
+import { type Memory, DisplayAddressRange } from "@learn6502/core";
 import { type DisplayWidget, DEFAULT_COLOR_PALETTE } from "@learn6502/common-ui";
 
 /**
diff --git a/packages/app-web/src/game-console.ts b/packages/app-web/src/game-console.ts
index d53de0d2..0b2bfc2f 100644
--- a/packages/app-web/src/game-console.ts
+++ b/packages/app-web/src/game-console.ts
@@ -1,4 +1,4 @@
-import { Memory, Labels, Simulator, Assembler, formatMessage } from "@learn6502/6502";
+import { Memory, Labels, Simulator, Assembler, formatMessage } from "@learn6502/core";
 import { Debugger } from "./debugger.js";
 import { Display } from "./display.js";
 import { UIState } from "./ui-state.js";
diff --git a/packages/common-ui/global.d.ts b/packages/common-ui/global.d.ts
index 762ceffb..d6f64dfc 100644
--- a/packages/common-ui/global.d.ts
+++ b/packages/common-ui/global.d.ts
@@ -1,4 +1,4 @@
-/// <reference types="@learn6502/6502/global" />
+/// <reference types="@learn6502/core/global" />
 
 // We don't want to use the DOM types in the common-ui package to make it cross-platform,
 // but we need the console types.
diff --git a/packages/common-ui/package.json b/packages/common-ui/package.json
index 96033b16..6a13de96 100644
--- a/packages/common-ui/package.json
+++ b/packages/common-ui/package.json
@@ -15,6 +15,6 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@learn6502/6502": "^0.7.0"
+    "@learn6502/core": "^0.7.0"
   }
 }
diff --git a/packages/common-ui/src/controller/debugger-controller.ts b/packages/common-ui/src/controller/debugger-controller.ts
index a20fe473..5626950e 100644
--- a/packages/common-ui/src/controller/debugger-controller.ts
+++ b/packages/common-ui/src/controller/debugger-controller.ts
@@ -1,4 +1,4 @@
-import { type Memory, type Simulator, type Assembler, EventDispatcher, throttle } from "@learn6502/6502";
+import { type Memory, type Simulator, type Assembler, EventDispatcher, throttle } from "@learn6502/core";
 
 import { DebuggerState } from "../data/index.ts";
 import type { DebuggerEventMap } from "../types/index.ts";
diff --git a/packages/common-ui/src/controller/editor-controller.ts b/packages/common-ui/src/controller/editor-controller.ts
index f330fcee..90175983 100644
--- a/packages/common-ui/src/controller/editor-controller.ts
+++ b/packages/common-ui/src/controller/editor-controller.ts
@@ -1,4 +1,4 @@
-import { EventDispatcher } from "@learn6502/6502";
+import { EventDispatcher } from "@learn6502/core";
 import type { SourceViewWidget } from "../widgets/source-view";
 import type { EditorEventMap } from "../types/editor-event-map";
 
diff --git a/packages/common-ui/src/controller/game-console-controller.ts b/packages/common-ui/src/controller/game-console-controller.ts
index edd0d813..074a4c21 100644
--- a/packages/common-ui/src/controller/game-console-controller.ts
+++ b/packages/common-ui/src/controller/game-console-controller.ts
@@ -21,7 +21,7 @@ import {
   type SimulatorPseudoOpEvent,
   type LabelsInfoEvent,
   type LabelsFailureEvent,
-} from "@learn6502/6502";
+} from "@learn6502/core";
 import { getGamepadKeyCode } from "../data";
 import type { GamepadKey, GameConsoleEventMap } from "../types";
 import type { DisplayWidget, GamepadWidget } from "../widgets/game-console";
diff --git a/packages/common-ui/src/controller/game-console-event-bridge.ts b/packages/common-ui/src/controller/game-console-event-bridge.ts
index 77391a6d..4a69fdc0 100644
--- a/packages/common-ui/src/controller/game-console-event-bridge.ts
+++ b/packages/common-ui/src/controller/game-console-event-bridge.ts
@@ -1,5 +1,5 @@
-import { SimulatorState, _ } from "@learn6502/6502";
-import type { Assembler, Simulator } from "@learn6502/6502";
+import { SimulatorState, _ } from "@learn6502/core";
+import type { Assembler, Simulator } from "@learn6502/core";
 import { gameConsoleController } from "./game-console-controller.ts";
 import { debuggerController } from "./debugger-controller.ts";
 
diff --git a/packages/common-ui/src/controller/learn-controller.ts b/packages/common-ui/src/controller/learn-controller.ts
index 01aa3175..81860c78 100644
--- a/packages/common-ui/src/controller/learn-controller.ts
+++ b/packages/common-ui/src/controller/learn-controller.ts
@@ -1,4 +1,4 @@
-import { EventDispatcher } from "@learn6502/6502";
+import { EventDispatcher } from "@learn6502/core";
 import type { LearnEventMap } from "../types/learn-event-map";
 import { learnStateService } from "../services/index.ts";
 
diff --git a/packages/common-ui/src/controller/main-ui-state-controller.ts b/packages/common-ui/src/controller/main-ui-state-controller.ts
index 066244f0..2cfb1f99 100644
--- a/packages/common-ui/src/controller/main-ui-state-controller.ts
+++ b/packages/common-ui/src/controller/main-ui-state-controller.ts
@@ -1,6 +1,6 @@
 import type { MainButtonActionState, MainUiStateEventMap, MainUiState } from "../types";
 import { MainButtonState } from "../data/index";
-import { EventDispatcher, SimulatorState } from "@learn6502/6502";
+import { EventDispatcher, SimulatorState } from "@learn6502/core";
 import { buttonStateService } from "../services";
 import { ViewType } from "../views/main";
 
diff --git a/packages/common-ui/src/data/memory-regions.ts b/packages/common-ui/src/data/memory-regions.ts
index eda6ecae..af8963f6 100644
--- a/packages/common-ui/src/data/memory-regions.ts
+++ b/packages/common-ui/src/data/memory-regions.ts
@@ -1,4 +1,4 @@
-import { _ } from "@learn6502/6502";
+import { _ } from "@learn6502/core";
 import type { MemoryRegion } from "../types/index.js";
 
 /**
diff --git a/packages/common-ui/src/services/button-state.service.ts b/packages/common-ui/src/services/button-state.service.ts
index 0feb8e7a..71b73f0d 100644
--- a/packages/common-ui/src/services/button-state.service.ts
+++ b/packages/common-ui/src/services/button-state.service.ts
@@ -1,4 +1,4 @@
-import { SimulatorState } from "@learn6502/6502";
+import { SimulatorState } from "@learn6502/core";
 import { MainButtonState } from "../data/index";
 import { ViewType } from "../views/main";
 import type { MainButtonActionState } from "../types";
diff --git a/packages/common-ui/src/services/debugger-state.service.ts b/packages/common-ui/src/services/debugger-state.service.ts
index e0d2ce8f..184f4bc8 100644
--- a/packages/common-ui/src/services/debugger-state.service.ts
+++ b/packages/common-ui/src/services/debugger-state.service.ts
@@ -1,4 +1,4 @@
-import { SimulatorState } from "@learn6502/6502";
+import { SimulatorState } from "@learn6502/core";
 import { DebuggerState } from "../data/index";
 
 /**
diff --git a/packages/common-ui/src/services/game-console-input.service.ts b/packages/common-ui/src/services/game-console-input.service.ts
index 7dc24afb..34567e6d 100644
--- a/packages/common-ui/src/services/game-console-input.service.ts
+++ b/packages/common-ui/src/services/game-console-input.service.ts
@@ -1,4 +1,4 @@
-import { type Memory } from "@learn6502/6502";
+import { type Memory } from "@learn6502/core";
 import { getGamepadKeyCode } from "../data/index.ts";
 import type { GamepadKey } from "../types/index.ts";
 
diff --git a/packages/common-ui/src/services/game-console-state.service.ts b/packages/common-ui/src/services/game-console-state.service.ts
index 1353b252..71d5f5dd 100644
--- a/packages/common-ui/src/services/game-console-state.service.ts
+++ b/packages/common-ui/src/services/game-console-state.service.ts
@@ -1,4 +1,4 @@
-import { type Memory, DisplayAddressRange, hexToRgb } from "@learn6502/6502";
+import { type Memory, DisplayAddressRange, hexToRgb } from "@learn6502/core";
 import { DEFAULT_COLOR_PALETTE } from "../data/index.ts";
 import type { RGBColor } from "../types/index.ts";
 
diff --git a/packages/common-ui/src/services/theme.service.ts b/packages/common-ui/src/services/theme.service.ts
index 65fd2ca6..3b42dc48 100644
--- a/packages/common-ui/src/services/theme.service.ts
+++ b/packages/common-ui/src/services/theme.service.ts
@@ -1,6 +1,6 @@
 import type { ThemeMode } from "../types";
 import type { ThemeEventMap } from "../types/theme-event-map";
-import { EventDispatcher } from "../../../6502/src/event-dispatcher";
+import { EventDispatcher } from "@learn6502/core";
 
 /**
  * Abstract class for theme services
diff --git a/packages/common-ui/src/types/debugger-event-map.ts b/packages/common-ui/src/types/debugger-event-map.ts
index 9459d334..b7758503 100644
--- a/packages/common-ui/src/types/debugger-event-map.ts
+++ b/packages/common-ui/src/types/debugger-event-map.ts
@@ -1,4 +1,4 @@
-import type { Memory, Simulator, Assembler } from "@learn6502/6502";
+import type { Memory, Simulator, Assembler } from "@learn6502/core";
 import type { DebuggerState } from "../data/index.ts";
 
 /**
diff --git a/packages/common-ui/src/types/game-console-event-map.ts b/packages/common-ui/src/types/game-console-event-map.ts
index ed086b8c..721235be 100644
--- a/packages/common-ui/src/types/game-console-event-map.ts
+++ b/packages/common-ui/src/types/game-console-event-map.ts
@@ -15,7 +15,7 @@ import {
   type SimulatorPseudoOpEvent,
   type LabelsInfoEvent,
   type LabelsFailureEvent,
-} from "@learn6502/6502";
+} from "@learn6502/core";
 import type { GamepadEvent } from "./gamepad-event";
 
 /**
diff --git a/packages/common-ui/src/types/main-ui-state-event-map.ts b/packages/common-ui/src/types/main-ui-state-event-map.ts
index 93893ef5..63a16164 100644
--- a/packages/common-ui/src/types/main-ui-state-event-map.ts
+++ b/packages/common-ui/src/types/main-ui-state-event-map.ts
@@ -1,6 +1,6 @@
 import type { MainButtonState } from "../data/index.ts";
 import type { ViewType } from "../views/main";
-import type { SimulatorState } from "@learn6502/6502";
+import type { SimulatorState } from "@learn6502/core";
 
 /**
  * Complete state object containing all UI states
diff --git a/packages/common-ui/src/utils/simulator-factory.ts b/packages/common-ui/src/utils/simulator-factory.ts
index d67bef02..4eaf9357 100644
--- a/packages/common-ui/src/utils/simulator-factory.ts
+++ b/packages/common-ui/src/utils/simulator-factory.ts
@@ -1,4 +1,4 @@
-import { Memory, Labels, Simulator, Assembler } from "@learn6502/6502";
+import { Memory, Labels, Simulator, Assembler } from "@learn6502/core";
 
 export interface SimulatorStack {
   memory: Memory;
diff --git a/packages/common-ui/src/views/debugger.ts b/packages/common-ui/src/views/debugger.ts
index 538be92a..e638c575 100644
--- a/packages/common-ui/src/views/debugger.ts
+++ b/packages/common-ui/src/views/debugger.ts
@@ -1,4 +1,4 @@
-import type { Memory, Simulator } from "@learn6502/6502";
+import type { Memory, Simulator } from "@learn6502/core";
 import type { DebuggerState } from "../data/index.ts";
 
 export interface DebuggerView {
diff --git a/packages/common-ui/src/views/editor.ts b/packages/common-ui/src/views/editor.ts
index 97c52dc4..b740e23e 100644
--- a/packages/common-ui/src/views/editor.ts
+++ b/packages/common-ui/src/views/editor.ts
@@ -1,4 +1,4 @@
-import type { EventDispatcher } from "@learn6502/6502";
+import type { EventDispatcher } from "@learn6502/core";
 import type { EditorEventMap } from "../types/editor-event-map";
 
 /**
diff --git a/packages/common-ui/src/views/game-console.ts b/packages/common-ui/src/views/game-console.ts
index 46f4640b..ed196466 100644
--- a/packages/common-ui/src/views/game-console.ts
+++ b/packages/common-ui/src/views/game-console.ts
@@ -1,4 +1,4 @@
-import type { Memory, Simulator, Assembler, Labels } from "@learn6502/6502";
+import type { Memory, Simulator, Assembler, Labels } from "@learn6502/core";
 import type { GamepadKey } from "../types";
 
 /**
diff --git a/packages/common-ui/src/views/main.ts b/packages/common-ui/src/views/main.ts
index 43953948..78be07ae 100644
--- a/packages/common-ui/src/views/main.ts
+++ b/packages/common-ui/src/views/main.ts
@@ -1,4 +1,4 @@
-import type { SimulatorState } from "@learn6502/6502";
+import type { SimulatorState } from "@learn6502/core";
 
 /**
  * View types supported across platforms
diff --git a/packages/common-ui/src/widgets/debugger/debug-info.ts b/packages/common-ui/src/widgets/debugger/debug-info.ts
index d4a2f738..241bfdc2 100644
--- a/packages/common-ui/src/widgets/debugger/debug-info.ts
+++ b/packages/common-ui/src/widgets/debugger/debug-info.ts
@@ -1,4 +1,4 @@
-import type { Simulator } from "@learn6502/6502";
+import type { Simulator } from "@learn6502/core";
 
 export interface DebugInfoWidget {
   update(simulator: Simulator): void;
diff --git a/packages/common-ui/src/widgets/debugger/disassembled.ts b/packages/common-ui/src/widgets/debugger/disassembled.ts
index 96621bae..63ec6d53 100644
--- a/packages/common-ui/src/widgets/debugger/disassembled.ts
+++ b/packages/common-ui/src/widgets/debugger/disassembled.ts
@@ -1,4 +1,4 @@
-import type { Assembler, EventDispatcher } from "@learn6502/6502";
+import type { Assembler, EventDispatcher } from "@learn6502/core";
 import type { DisassembledEventMap } from "../../types/index.js";
 
 export interface DisassembledWidget {
diff --git a/packages/common-ui/src/widgets/debugger/hex-monitor.ts b/packages/common-ui/src/widgets/debugger/hex-monitor.ts
index c6a36a9c..0cc86c3b 100644
--- a/packages/common-ui/src/widgets/debugger/hex-monitor.ts
+++ b/packages/common-ui/src/widgets/debugger/hex-monitor.ts
@@ -1,6 +1,6 @@
 import type { HexMonitorOptions, MemoryRegion, HexMonitorEventMap } from "../../types/index.js";
-import type { Memory } from "@learn6502/6502";
-import type { EventDispatcher } from "@learn6502/6502";
+import type { Memory } from "@learn6502/core";
+import type { EventDispatcher } from "@learn6502/core";
 
 export interface HexMonitorWidget {
   readonly events: EventDispatcher<HexMonitorEventMap>;
diff --git a/packages/common-ui/src/widgets/debugger/hexdump.ts b/packages/common-ui/src/widgets/debugger/hexdump.ts
index 64008d05..3b6f701f 100644
--- a/packages/common-ui/src/widgets/debugger/hexdump.ts
+++ b/packages/common-ui/src/widgets/debugger/hexdump.ts
@@ -1,4 +1,4 @@
-import type { Assembler, EventDispatcher } from "@learn6502/6502";
+import type { Assembler, EventDispatcher } from "@learn6502/core";
 import type { HexdumpEventMap } from "../../types/index.js";
 
 export interface HexdumpWidget {
diff --git a/packages/common-ui/src/widgets/game-console/display.ts b/packages/common-ui/src/widgets/game-console/display.ts
index f07d8c02..9c663512 100644
--- a/packages/common-ui/src/widgets/game-console/display.ts
+++ b/packages/common-ui/src/widgets/game-console/display.ts
@@ -1,4 +1,4 @@
-import type { Memory } from "@learn6502/6502";
+import type { Memory } from "@learn6502/core";
 
 /**
  * Interface for display widgets across different platforms
diff --git a/packages/common-ui/src/widgets/game-console/gamepad.ts b/packages/common-ui/src/widgets/game-console/gamepad.ts
index 5d9d2a43..0f73e2b4 100644
--- a/packages/common-ui/src/widgets/game-console/gamepad.ts
+++ b/packages/common-ui/src/widgets/game-console/gamepad.ts
@@ -1,4 +1,4 @@
-import type { EventDispatcher } from "@learn6502/6502";
+import type { EventDispatcher } from "@learn6502/core";
 import type { GamepadKey, GamepadEventMap } from "../../types/index.js";
 
 /**
diff --git a/packages/common-ui/src/widgets/main-button.ts b/packages/common-ui/src/widgets/main-button.ts
index a251e6c6..0933580d 100644
--- a/packages/common-ui/src/widgets/main-button.ts
+++ b/packages/common-ui/src/widgets/main-button.ts
@@ -1,4 +1,4 @@
-import type { SimulatorState } from "@learn6502/6502";
+import type { SimulatorState } from "@learn6502/core";
 import type { MainButtonState } from "../data/index";
 import { ViewType } from "../views/main";
 
diff --git a/packages/common-ui/src/widgets/source-view.ts b/packages/common-ui/src/widgets/source-view.ts
index b37b2d74..c5d377e7 100644
--- a/packages/common-ui/src/widgets/source-view.ts
+++ b/packages/common-ui/src/widgets/source-view.ts
@@ -1,4 +1,4 @@
-import type { EventDispatcher } from "@learn6502/6502";
+import type { EventDispatcher } from "@learn6502/core";
 import type { SourceViewEventMap } from "../types/source-view-event-map";
 
 /**
diff --git a/packages/examples/commented-snake/commented-snake.meta.ts b/packages/examples/commented-snake/commented-snake.meta.ts
index 4bcd8de1..dff27274 100644
--- a/packages/examples/commented-snake/commented-snake.meta.ts
+++ b/packages/examples/commented-snake/commented-snake.meta.ts
@@ -1,4 +1,4 @@
-import { _ } from "@learn6502/6502";
+import { _ } from "@learn6502/core";
 import type { ExampleMetaJson } from "../example-meta.ts";
 export default {
   slug: "commented-snake",
diff --git a/packages/examples/package.json b/packages/examples/package.json
index 55578e21..a7dd97e9 100644
--- a/packages/examples/package.json
+++ b/packages/examples/package.json
@@ -21,6 +21,6 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@learn6502/6502": "^0.7.0"
+    "@learn6502/core": "^0.7.0"
   }
 }
diff --git a/packages/examples/snake/snake.meta.ts b/packages/examples/snake/snake.meta.ts
index 08111ccd..cf9b1550 100644
--- a/packages/examples/snake/snake.meta.ts
+++ b/packages/examples/snake/snake.meta.ts
@@ -1,4 +1,4 @@
-import { _ } from "@learn6502/6502";
+import { _ } from "@learn6502/core";
 import type { ExampleMetaJson } from "../example-meta.ts";
 export default {
   slug: "snake",
diff --git a/packages/examples/stack-example/stack-example.meta.ts b/packages/examples/stack-example/stack-example.meta.ts
index 7e654380..79737286 100644
--- a/packages/examples/stack-example/stack-example.meta.ts
+++ b/packages/examples/stack-example/stack-example.meta.ts
@@ -1,4 +1,4 @@
-import { _ } from "@learn6502/6502";
+import { _ } from "@learn6502/core";
 import type { ExampleMetaJson } from "../example-meta.ts";
 export default {
   slug: "stack-example",