diff --git a/docs/_scripts/build_docs/index.ts b/docs/_scripts/build_docs/index.ts
index 447feed37..7598e7b46 100644
--- a/docs/_scripts/build_docs/index.ts
+++ b/docs/_scripts/build_docs/index.ts
@@ -13,8 +13,8 @@
 
 import path from "path";
 import fs from "fs";
-import { Malloy } from "malloy";
-import { BigQueryConnection } from "malloy-db-bigquery";
+import { Malloy } from "@malloy-lang/malloy";
+import { BigQueryConnection } from "@malloy-lang/malloy-db-bigquery";
 import { performance } from "perf_hooks";
 import { renderDoc } from "./render_document";
 import { renderFooter, renderSidebar, Section } from "./page";
diff --git a/docs/_scripts/build_docs/render_document.ts b/docs/_scripts/build_docs/render_document.ts
index 9baaf8c2e..9d49cd087 100644
--- a/docs/_scripts/build_docs/render_document.ts
+++ b/docs/_scripts/build_docs/render_document.ts
@@ -21,8 +21,8 @@ import "prismjs/components/prism-json";
 import "prismjs/components/prism-sql";
 import { runCode } from "./run_code";
 import { log } from "./log";
-import { Malloy } from "malloy";
-import { BigQueryConnection } from "malloy-db-bigquery";
+import { Malloy } from "@malloy-lang/malloy";
+import { BigQueryConnection } from "@malloy-lang/malloy-db-bigquery";
 
 Malloy.db = new BigQueryConnection("docs");
 
diff --git a/docs/_scripts/build_docs/run_code.ts b/docs/_scripts/build_docs/run_code.ts
index 6e1630bab..8685b1a3f 100644
--- a/docs/_scripts/build_docs/run_code.ts
+++ b/docs/_scripts/build_docs/run_code.ts
@@ -17,8 +17,8 @@
  * that depend on that model. If `--watch` is enabled, changes to a model file
  * will cause relevant documents to recompile.
  */
-import { DataStyles, DataTreeRoot, HtmlView } from "malloy-render";
-import { Malloy, MalloyTranslator } from "malloy";
+import { DataStyles, DataTreeRoot, HtmlView } from "@malloy-lang/malloy-render";
+import { Malloy, MalloyTranslator } from "@malloy-lang/malloy";
 import path from "path";
 import fs from "fs";
 import { performance } from "perf_hooks";
diff --git a/package.json b/package.json
index 305de4313..ae8c21b58 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "version": "0.0.1",
   "license": "GPL-2.0",
-  "name": "@looker-open-source/malloy",
+  "name": "@malloy-lang/malloy",
   "workspaces": {
     "packages": [
       "packages/*"
@@ -15,8 +15,8 @@
     "samples"
   ],
   "scripts": {
-    "clean": "yarn workspace malloy clean && yarn tsc --build --clean",
-    "build": "yarn workspace malloy build-parser && yarn tsc --build",
+    "clean": "yarn workspace @malloy-lang/malloy clean && yarn tsc --build --clean",
+    "build": "yarn workspace @malloy-lang/malloy build-parser && yarn tsc --build",
     "lint": "yarn eslint '**/*.ts{,x}'",
     "test": "yarn lint && yarn build && yarn workspaces run test",
     "test-fast": "yarn workspaces run test",
@@ -26,7 +26,7 @@
     "docs-preprocess": "ts-node docs/_scripts/build_docs/index.ts --watch",
     "docs-postprocess": "yarn wait-on ./docs/_includes/generated/toc.html && cd docs && bundle exec jekyll serve -l -o",
     "docs-serve": "yarn docs-prebuild && yarn concurrently --kill-others 'yarn docs-preprocess' 'yarn docs-postprocess'",
-    "vscode-webpack-dev": "yarn workspace malloy-vscode webpack-dev",
+    "vscode-webpack-dev": "yarn workspace @malloy-lang/malloy-vscode webpack-dev",
     "third-party-licenses": "ts-node scripts/third_party_licenses"
   },
   "resolutions": {},
@@ -45,9 +45,9 @@
     "jest": "26.6.0",
     "jest-diff": "^27.0.6",
     "jest-expect-message": "^1.0.2",
-    "malloy": "*",
-    "malloy-db-bigquery": "*",
-    "malloy-render": "*",
+    "@malloy-lang/malloy": "*",
+    "@malloy-lang/malloy-db-bigquery": "*",
+    "@malloy-lang/malloy-render": "*",
     "md5": "^2.3.0",
     "prettier": "^2.3.2",
     "prismjs": "^1.24.1",
diff --git a/packages/malloy-db-bigquery/package.json b/packages/malloy-db-bigquery/package.json
index 26634abcb..9be50a08d 100644
--- a/packages/malloy-db-bigquery/package.json
+++ b/packages/malloy-db-bigquery/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "malloy-db-bigquery",
+  "name": "@malloy-lang/malloy-db-bigquery",
   "version": "0.0.1",
   "license": "GPL-2.0",
   "main": "dist/index.js",
@@ -14,6 +14,6 @@
     "@google-cloud/bigquery": "^5.5.0",
     "@google-cloud/common": "^3.6.0",
     "gaxios": "^4.2.0",
-    "malloy": "*"
+    "@malloy-lang/malloy": "*"
   }
 }
diff --git a/packages/malloy-db-bigquery/src/bigquery.spec.ts b/packages/malloy-db-bigquery/src/bigquery.spec.ts
index e0cbabfbf..4afff75de 100644
--- a/packages/malloy-db-bigquery/src/bigquery.spec.ts
+++ b/packages/malloy-db-bigquery/src/bigquery.spec.ts
@@ -1,4 +1,4 @@
-import { Malloy } from "malloy";
+import { Malloy } from "@malloy-lang/malloy";
 import { BigQueryConnection } from "./bigquery_connection";
 import { BigQuery as BigQuerySDK, TableMetadata } from "@google-cloud/bigquery";
 
diff --git a/packages/malloy-db-bigquery/src/bigquery_connection.ts b/packages/malloy-db-bigquery/src/bigquery_connection.ts
index 2f84fd3e8..f6bd26753 100644
--- a/packages/malloy-db-bigquery/src/bigquery_connection.ts
+++ b/packages/malloy-db-bigquery/src/bigquery_connection.ts
@@ -32,7 +32,7 @@ import {
   FieldTypeDef,
   NamedStructDefs,
   Connection,
-} from "malloy";
+} from "@malloy-lang/malloy";
 
 export interface BigQueryManagerOptions {
   credentials?: {
diff --git a/packages/malloy-db-postgres/package.json b/packages/malloy-db-postgres/package.json
index 9eb8809d1..f9cd6426a 100644
--- a/packages/malloy-db-postgres/package.json
+++ b/packages/malloy-db-postgres/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "malloy-db-postgres",
+  "name": "@malloy-lang/malloy-db-postgres",
   "version": "0.0.1",
   "license": "GPL-2.0",
   "main": "dist/index.js",
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@types/pg": "^8.6.1",
-    "malloy": "*",
+    "@malloy-lang/malloy": "*",
     "pg": "^8.7.1"
   }
 }
diff --git a/packages/malloy-db-postgres/src/postgres_connection.ts b/packages/malloy-db-postgres/src/postgres_connection.ts
index b83fa7089..4bdaf7932 100644
--- a/packages/malloy-db-postgres/src/postgres_connection.ts
+++ b/packages/malloy-db-postgres/src/postgres_connection.ts
@@ -19,7 +19,7 @@ import {
   NamedStructDefs,
   AtomicFieldType,
   QueryData,
-} from "malloy";
+} from "@malloy-lang/malloy";
 import { Client } from "pg";
 
 const postgresToMalloyTypes: { [key: string]: AtomicFieldType } = {
diff --git a/packages/malloy-db-test/package.json b/packages/malloy-db-test/package.json
index afc6fe37a..778ca55ba 100644
--- a/packages/malloy-db-test/package.json
+++ b/packages/malloy-db-test/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "malloy-db-test",
+  "name": "@malloy-lang/malloy-db-test",
   "version": "0.0.1",
   "license": "GPL-2.0",
   "main": "dist/index.js",
@@ -11,7 +11,7 @@
     "build": "yarn tsc --build"
   },
   "dependencies": {
-    "malloy": "*",
-    "malloy-db-bigquery": "*"
+    "@malloy-lang/malloy": "*",
+    "@malloy-lang/malloy-db-bigquery": "*"
   }
 }
diff --git a/packages/malloy-db-test/src/expr.spec.ts b/packages/malloy-db-test/src/expr.spec.ts
index fbd483b42..445f9e58e 100644
--- a/packages/malloy-db-test/src/expr.spec.ts
+++ b/packages/malloy-db-test/src/expr.spec.ts
@@ -12,8 +12,14 @@
  * GNU General Public License for more details.
  */
 
-import { Malloy, ModelDef, QueryModel, QueryResult, StructDef } from "malloy";
-import { BigQueryConnection } from "malloy-db-bigquery";
+import {
+  Malloy,
+  ModelDef,
+  QueryModel,
+  QueryResult,
+  StructDef,
+} from "@malloy-lang/malloy";
+import { BigQueryConnection } from "@malloy-lang/malloy-db-bigquery";
 import { fStringEq, fStringLike } from "./test_utils";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/packages/malloy-db-test/src/join.spec.ts b/packages/malloy-db-test/src/join.spec.ts
index e644e0bc9..464a79fe2 100644
--- a/packages/malloy-db-test/src/join.spec.ts
+++ b/packages/malloy-db-test/src/join.spec.ts
@@ -12,8 +12,8 @@
  */
 /* eslint-disable no-console */
 
-import { Malloy, QueryModel } from "malloy";
-import { BigQueryConnection } from "malloy-db-bigquery";
+import { Malloy, QueryModel } from "@malloy-lang/malloy";
+import { BigQueryConnection } from "@malloy-lang/malloy-db-bigquery";
 
 Malloy.db = new BigQueryConnection("test");
 
diff --git a/packages/malloy-db-test/src/malloy-to-json.ts b/packages/malloy-db-test/src/malloy-to-json.ts
index c5dfeaabc..a79c5011c 100644
--- a/packages/malloy-db-test/src/malloy-to-json.ts
+++ b/packages/malloy-db-test/src/malloy-to-json.ts
@@ -12,8 +12,8 @@
  */
 /* eslint-disable no-console */
 import * as readline from "readline";
-import { Malloy, MalloyTranslator } from "malloy";
-import { pretty } from "malloy/src/lang/jest-factories";
+import { Malloy, MalloyTranslator } from "@malloy-lang/malloy";
+import { pretty } from "@malloy-lang/malloy/src/lang/jest-factories";
 import { readFileSync } from "fs";
 
 /*
diff --git a/packages/malloy-db-test/src/malloy_query.spec.ts b/packages/malloy-db-test/src/malloy_query.spec.ts
index 88d331145..1566b365c 100644
--- a/packages/malloy-db-test/src/malloy_query.spec.ts
+++ b/packages/malloy-db-test/src/malloy_query.spec.ts
@@ -12,14 +12,14 @@
  */
 
 import { test } from "@jest/globals";
-import { Malloy, QueryModel } from "malloy";
+import { Malloy, QueryModel } from "@malloy-lang/malloy";
 import { testModel } from "./models/faa_model";
 import { fStringEq } from "./test_utils";
 
-import "malloy/src/lang/jestery";
-import { TestTranslator } from "malloy/src/lang/jest-factories";
+import "@malloy-lang/malloy/src/lang/jestery";
+import { TestTranslator } from "@malloy-lang/malloy/src/lang/jest-factories";
 import { FLIGHTS_EXPLORE } from "./models/faa_model";
-import { BigQueryConnection } from "malloy-db-bigquery";
+import { BigQueryConnection } from "@malloy-lang/malloy-db-bigquery";
 
 Malloy.db = new BigQueryConnection("test");
 
diff --git a/packages/malloy-db-test/src/models/faa_model.ts b/packages/malloy-db-test/src/models/faa_model.ts
index 4a7933fc4..65b530832 100644
--- a/packages/malloy-db-test/src/models/faa_model.ts
+++ b/packages/malloy-db-test/src/models/faa_model.ts
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-import { ModelDef, StructDef } from "malloy/src/model/malloy_types";
+import { ModelDef, StructDef } from "@malloy-lang/malloy";
 import { medicareModel, medicareStateFacts } from "./medicare_model";
 import { fStringEq, fYearEq } from "../test_utils";
 
diff --git a/packages/malloy-db-test/src/models/medicare_model.ts b/packages/malloy-db-test/src/models/medicare_model.ts
index 69d2aa52c..e96404b31 100644
--- a/packages/malloy-db-test/src/models/medicare_model.ts
+++ b/packages/malloy-db-test/src/models/medicare_model.ts
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-import { StructDef } from "malloy";
+import { StructDef } from "@malloy-lang/malloy";
 
 /** Medicare Model */
 export const medicareModel: StructDef = {
diff --git a/packages/malloy-db-test/src/production-models.spec.ts b/packages/malloy-db-test/src/production-models.spec.ts
index 9d759441b..300631371 100644
--- a/packages/malloy-db-test/src/production-models.spec.ts
+++ b/packages/malloy-db-test/src/production-models.spec.ts
@@ -11,12 +11,12 @@
  * GNU General Public License for more details.
  */
 
-import "malloy/src/lang/jestery";
+import "@malloy-lang/malloy/src/lang/jestery";
 import fs from "fs";
 import path from "path";
-import { Malloy } from "malloy/src/malloy";
-import { MalloyTranslator, TranslateResponse } from "malloy";
-import { BigQueryConnection } from "malloy-db-bigquery";
+import { Malloy } from "@malloy-lang/malloy/src/malloy";
+import { MalloyTranslator, TranslateResponse } from "@malloy-lang/malloy";
+import { BigQueryConnection } from "@malloy-lang/malloy-db-bigquery";
 
 Malloy.db = new BigQueryConnection("test");
 
diff --git a/packages/malloy-db-test/src/test_utils.ts b/packages/malloy-db-test/src/test_utils.ts
index 201b493a1..98c4e9961 100644
--- a/packages/malloy-db-test/src/test_utils.ts
+++ b/packages/malloy-db-test/src/test_utils.ts
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-import { FilterExpression, Fragment } from "malloy";
+import { FilterExpression, Fragment } from "@malloy-lang/malloy";
 
 export function fStringEq(field: string, value: string): FilterExpression {
   return {
diff --git a/packages/malloy-render/package.json b/packages/malloy-render/package.json
index 42d948619..d83a5e664 100644
--- a/packages/malloy-render/package.json
+++ b/packages/malloy-render/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "malloy-render",
+  "name": "@malloy-lang/malloy-render",
   "version": "0.0.1",
   "license": "GPL-2.0",
   "main": "dist/index.js",
@@ -11,6 +11,6 @@
     "build": "yarn tsc --build"
   },
   "dependencies": {
-    "malloy": "*"
+    "@malloy-lang/malloy": "*"
   }
 }
diff --git a/packages/malloy-render/src/data_table.ts b/packages/malloy-render/src/data_table.ts
index 21ee44a52..589fc4f00 100644
--- a/packages/malloy-render/src/data_table.ts
+++ b/packages/malloy-render/src/data_table.ts
@@ -17,7 +17,7 @@ import {
   QueryScalar,
   FieldDef,
   FilterExpression,
-} from "malloy";
+} from "@malloy-lang/malloy";
 
 export type DataValue = QueryScalar | DataTree;
 
diff --git a/packages/malloy-render/src/drill.ts b/packages/malloy-render/src/drill.ts
index b3960be27..fdc062888 100644
--- a/packages/malloy-render/src/drill.ts
+++ b/packages/malloy-render/src/drill.ts
@@ -20,7 +20,7 @@ import {
   isValueDate,
   TimeTimeframe,
   isFieldTimeBased,
-} from "malloy";
+} from "@malloy-lang/malloy";
 import { DataPointer, DataTree, DataTreeRoot, isDataTree } from "./data_table";
 
 type FilterItem = { key: string; value: string | undefined };
diff --git a/packages/malloy-render/src/html/bar_chart.ts b/packages/malloy-render/src/html/bar_chart.ts
index 9ce9a00d3..e8996263b 100644
--- a/packages/malloy-render/src/html/bar_chart.ts
+++ b/packages/malloy-render/src/html/bar_chart.ts
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-import { FieldDef, isMeasureLike } from "malloy";
+import { FieldDef, isMeasureLike } from "@malloy-lang/malloy";
 import {
   BarChartRenderOptions,
   ChartSize,
diff --git a/packages/malloy-render/src/html/cartesian_chart.ts b/packages/malloy-render/src/html/cartesian_chart.ts
index 4e21d19a0..383ebf995 100644
--- a/packages/malloy-render/src/html/cartesian_chart.ts
+++ b/packages/malloy-render/src/html/cartesian_chart.ts
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-import { QueryData, StructDef } from "malloy";
+import { QueryData, StructDef } from "@malloy-lang/malloy";
 import * as lite from "vega-lite";
 import { HtmlChartRenderer } from "./chart";
 import { getColorScale } from "./utils";
diff --git a/packages/malloy-render/src/html/chart.ts b/packages/malloy-render/src/html/chart.ts
index 0aa16ae55..9b0ef4d11 100644
--- a/packages/malloy-render/src/html/chart.ts
+++ b/packages/malloy-render/src/html/chart.ts
@@ -19,7 +19,7 @@ import {
   QueryDataRow,
   QueryValue,
   StructDef,
-} from "malloy";
+} from "@malloy-lang/malloy";
 import { Renderer } from "../renderer";
 import { DataPointer, DataValue, isDataTree } from "../data_table";
 import { StyleDefaults } from "../data_styles";
diff --git a/packages/malloy-render/src/html/container.ts b/packages/malloy-render/src/html/container.ts
index fe89c66d6..f8fea4810 100644
--- a/packages/malloy-render/src/html/container.ts
+++ b/packages/malloy-render/src/html/container.ts
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-import { FieldDef, StructDef } from "malloy";
+import { FieldDef, StructDef } from "@malloy-lang/malloy";
 import { DataStyles, StyleDefaults } from "../data_styles";
 import { ChildRenderers, RenderTree } from "../renderer";
 import { makeRenderer } from "./html_view";
diff --git a/packages/malloy-render/src/html/dashboard.ts b/packages/malloy-render/src/html/dashboard.ts
index 5ca6d022f..24a41324b 100644
--- a/packages/malloy-render/src/html/dashboard.ts
+++ b/packages/malloy-render/src/html/dashboard.ts
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-import { isDimensional, isMeasureLike } from "malloy";
+import { isDimensional, isMeasureLike } from "@malloy-lang/malloy";
 import { StyleDefaults } from "../data_styles";
 import { DataPointer, DataValue, isDataTree } from "../data_table";
 import { ContainerRenderer } from "./container";
diff --git a/packages/malloy-render/src/html/html_view.ts b/packages/malloy-render/src/html/html_view.ts
index 745272244..2b75b2f50 100644
--- a/packages/malloy-render/src/html/html_view.ts
+++ b/packages/malloy-render/src/html/html_view.ts
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-import { FieldDef, StructDef } from "malloy";
+import { FieldDef, StructDef } from "@malloy-lang/malloy";
 import { TopLevelSpec } from "vega-lite";
 import { DataStyles, StyleDefaults } from "../data_styles";
 import { Renderer } from "../renderer";
diff --git a/packages/malloy-render/src/html/line_chart.ts b/packages/malloy-render/src/html/line_chart.ts
index 3fc5e8cfd..3d4f0f399 100644
--- a/packages/malloy-render/src/html/line_chart.ts
+++ b/packages/malloy-render/src/html/line_chart.ts
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-import { FieldDef, QueryValue } from "malloy";
+import { FieldDef, QueryValue } from "@malloy-lang/malloy";
 import { HtmlCartesianChartRenderer } from "./cartesian_chart";
 
 export class HtmlLineChartRenderer extends HtmlCartesianChartRenderer {
diff --git a/packages/malloy-render/src/html/list.ts b/packages/malloy-render/src/html/list.ts
index 58aa0a7db..21925215a 100644
--- a/packages/malloy-render/src/html/list.ts
+++ b/packages/malloy-render/src/html/list.ts
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-import { FieldDef, StructDef } from "malloy";
+import { FieldDef, StructDef } from "@malloy-lang/malloy";
 import { StyleDefaults } from "../data_styles";
 import { DataPointer, DataValue, isDataTree } from "../data_table";
 import { ContainerRenderer } from "./container";
diff --git a/packages/malloy-render/src/html/list_detail.ts b/packages/malloy-render/src/html/list_detail.ts
index 0d4aaaf5b..6a0cfa1ac 100644
--- a/packages/malloy-render/src/html/list_detail.ts
+++ b/packages/malloy-render/src/html/list_detail.ts
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-import { FieldDef, StructDef } from "malloy";
+import { FieldDef, StructDef } from "@malloy-lang/malloy";
 import { HtmlListRenderer } from "./list";
 
 export class HtmlListDetailRenderer extends HtmlListRenderer {
diff --git a/packages/malloy-render/src/html/point_map.ts b/packages/malloy-render/src/html/point_map.ts
index 3669b9db7..4a2d37c9d 100644
--- a/packages/malloy-render/src/html/point_map.ts
+++ b/packages/malloy-render/src/html/point_map.ts
@@ -12,7 +12,12 @@
  */
 
 import * as lite from "vega-lite";
-import { FieldDef, QueryData, QueryValue, StructDef } from "malloy";
+import {
+  FieldDef,
+  QueryData,
+  QueryValue,
+  StructDef,
+} from "@malloy-lang/malloy";
 import usAtlas from "us-atlas/states-10m.json";
 import { HtmlChartRenderer } from "./chart";
 import { getColorScale } from "./utils";
diff --git a/packages/malloy-render/src/html/scatter_chart.ts b/packages/malloy-render/src/html/scatter_chart.ts
index 43945b5bf..6f2dcb6f8 100644
--- a/packages/malloy-render/src/html/scatter_chart.ts
+++ b/packages/malloy-render/src/html/scatter_chart.ts
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-import { FieldDef, QueryValue } from "malloy";
+import { FieldDef, QueryValue } from "@malloy-lang/malloy";
 import { HtmlCartesianChartRenderer } from "./cartesian_chart";
 
 export class HtmlScatterChartRenderer extends HtmlCartesianChartRenderer {
diff --git a/packages/malloy-render/src/html/segment_map.ts b/packages/malloy-render/src/html/segment_map.ts
index 1eb937a15..6eccad6fc 100644
--- a/packages/malloy-render/src/html/segment_map.ts
+++ b/packages/malloy-render/src/html/segment_map.ts
@@ -12,7 +12,12 @@
  */
 
 import * as lite from "vega-lite";
-import { FieldDef, QueryData, QueryValue, StructDef } from "malloy";
+import {
+  FieldDef,
+  QueryData,
+  QueryValue,
+  StructDef,
+} from "@malloy-lang/malloy";
 import usAtlas from "us-atlas/states-10m.json";
 import { HtmlChartRenderer } from "./chart";
 import { getColorScale } from "./utils";
diff --git a/packages/malloy-render/src/html/shape_map.ts b/packages/malloy-render/src/html/shape_map.ts
index a8209d90c..fcc94a540 100644
--- a/packages/malloy-render/src/html/shape_map.ts
+++ b/packages/malloy-render/src/html/shape_map.ts
@@ -12,7 +12,12 @@
  */
 
 import * as lite from "vega-lite";
-import { FieldDef, QueryData, QueryValue, StructDef } from "malloy";
+import {
+  FieldDef,
+  QueryData,
+  QueryValue,
+  StructDef,
+} from "@malloy-lang/malloy";
 import usAtlas from "us-atlas/states-10m.json";
 import { HtmlChartRenderer } from "./chart";
 import { STATE_CODES } from "./state_codes";
diff --git a/packages/malloy-render/src/html/utils.ts b/packages/malloy-render/src/html/utils.ts
index 2df6984c9..21d956da4 100644
--- a/packages/malloy-render/src/html/utils.ts
+++ b/packages/malloy-render/src/html/utils.ts
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-import { TimeTimeframe } from "malloy";
+import { TimeTimeframe } from "@malloy-lang/malloy";
 
 function numberFixedDigits(value: number, digits: number) {
   return value.toString().padStart(digits, "0");
diff --git a/packages/malloy-render/src/html/vega_spec.ts b/packages/malloy-render/src/html/vega_spec.ts
index 302ba1c14..dce459884 100644
--- a/packages/malloy-render/src/html/vega_spec.ts
+++ b/packages/malloy-render/src/html/vega_spec.ts
@@ -12,7 +12,12 @@
  */
 
 import * as lite from "vega-lite";
-import { FieldDef, QueryDataRow, QueryValue, StructDef } from "malloy";
+import {
+  FieldDef,
+  QueryDataRow,
+  QueryValue,
+  StructDef,
+} from "@malloy-lang/malloy";
 import { HtmlChartRenderer } from "./chart";
 import { cloneDeep } from "lodash";
 import { getColorScale } from "./utils";
diff --git a/packages/malloy-vscode/package.json b/packages/malloy-vscode/package.json
index d69896134..c8a6cdefc 100644
--- a/packages/malloy-vscode/package.json
+++ b/packages/malloy-vscode/package.json
@@ -1,6 +1,6 @@
 {
   "name": "malloy-vscode",
-  "publisher": "malloy",
+  "publisher": "malloy-lang",
   "displayName": "Malloy",
   "description": "",
   "version": "0.0.1",
@@ -123,10 +123,10 @@
   },
   "dependencies": {
     "@observablehq/plot": "^0.1.0",
-    "malloy": "*",
-    "malloy-db-bigquery": "*",
-    "malloy-db-postgres": "*",
-    "malloy-render": "*",
+    "@malloy-lang/malloy": "*",
+    "@malloy-lang/malloy-db-bigquery": "*",
+    "@malloy-lang/malloy-db-postgres": "*",
+    "@malloy-lang/malloy-render": "*",
     "us-atlas": "^3.0.0",
     "vega": "5.17.3",
     "vega-lite": "4.17.0",
diff --git a/packages/malloy-vscode/src/extension/commands/run_query_utils.ts b/packages/malloy-vscode/src/extension/commands/run_query_utils.ts
index e96e62098..21e0f9a26 100644
--- a/packages/malloy-vscode/src/extension/commands/run_query_utils.ts
+++ b/packages/malloy-vscode/src/extension/commands/run_query_utils.ts
@@ -14,8 +14,8 @@
 import * as path from "path";
 import { performance } from "perf_hooks";
 import * as vscode from "vscode";
-import { Malloy, MalloyTranslator, ModelDef } from "malloy";
-import { DataStyles, HtmlView, DataTreeRoot } from "malloy-render";
+import { Malloy, MalloyTranslator, ModelDef } from "@malloy-lang/malloy";
+import { DataStyles, HtmlView, DataTreeRoot } from "@malloy-lang/malloy-render";
 import { loadingIndicator, renderErrorHtml, wrapHTMLSnippet } from "../html";
 import { MALLOY_EXTENSION_STATE, RunState } from "../state";
 import turtleIcon from "../../media/turtle.svg";
diff --git a/packages/malloy-vscode/src/extension/extension.ts b/packages/malloy-vscode/src/extension/extension.ts
index b02d2c61f..7d44d307a 100644
--- a/packages/malloy-vscode/src/extension/extension.ts
+++ b/packages/malloy-vscode/src/extension/extension.ts
@@ -31,9 +31,9 @@ import {
   runQueryWithEdit,
   showLicensesCommand,
 } from "./commands";
-import { Malloy } from "malloy";
+import { Malloy } from "@malloy-lang/malloy";
 import { showResultJsonCommand } from "./commands/show_result_json";
-import { BigQueryConnection } from "malloy-db-bigquery";
+import { BigQueryConnection } from "@malloy-lang/malloy-db-bigquery";
 
 Malloy.db = new BigQueryConnection("vsCode");
 
diff --git a/packages/malloy-vscode/src/extension/state.ts b/packages/malloy-vscode/src/extension/state.ts
index f0e785b26..497cfa8e1 100644
--- a/packages/malloy-vscode/src/extension/state.ts
+++ b/packages/malloy-vscode/src/extension/state.ts
@@ -12,7 +12,7 @@
  */
 
 import { TextDocument, WebviewPanel } from "vscode";
-import { QueryResult } from "malloy";
+import { QueryResult } from "@malloy-lang/malloy";
 
 export interface RunState {
   cancel: () => void;
diff --git a/packages/malloy-vscode/src/extension/tree_views/schema_view.ts b/packages/malloy-vscode/src/extension/tree_views/schema_view.ts
index a5a51bbd5..bacf42c92 100644
--- a/packages/malloy-vscode/src/extension/tree_views/schema_view.ts
+++ b/packages/malloy-vscode/src/extension/tree_views/schema_view.ts
@@ -13,7 +13,12 @@
 
 import * as path from "path";
 import * as vscode from "vscode";
-import { Malloy, FieldDef, MalloyTranslator, NamedMalloyObject } from "malloy";
+import {
+  Malloy,
+  FieldDef,
+  MalloyTranslator,
+  NamedMalloyObject,
+} from "@malloy-lang/malloy";
 import numberIcon from "../../media/number.svg";
 import numberAggregateIcon from "../../media/number-aggregate.svg";
 import booleanIcon from "../../media/boolean.svg";
diff --git a/packages/malloy-vscode/src/server/diagnostics/diagnostics.ts b/packages/malloy-vscode/src/server/diagnostics/diagnostics.ts
index 0fbd47161..24218f7cb 100644
--- a/packages/malloy-vscode/src/server/diagnostics/diagnostics.ts
+++ b/packages/malloy-vscode/src/server/diagnostics/diagnostics.ts
@@ -16,10 +16,10 @@ import {
   DiagnosticSeverity,
   TextDocuments,
 } from "vscode-languageserver/node";
-import { Malloy, MalloyTranslator, LogMessage } from "malloy";
+import { Malloy, MalloyTranslator, LogMessage } from "@malloy-lang/malloy";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import * as fs from "fs";
-import { BigQueryConnection } from "malloy-db-bigquery";
+import { BigQueryConnection } from "@malloy-lang/malloy-db-bigquery";
 
 Malloy.db = new BigQueryConnection("vsCode");
 
diff --git a/packages/malloy-vscode/src/server/highlights/highlights.ts b/packages/malloy-vscode/src/server/highlights/highlights.ts
index 15b1a9740..16379055c 100644
--- a/packages/malloy-vscode/src/server/highlights/highlights.ts
+++ b/packages/malloy-vscode/src/server/highlights/highlights.ts
@@ -12,7 +12,7 @@
  */
 
 import { TextDocument } from "vscode-languageserver-textdocument";
-import { HighlightType, MalloyTranslator } from "malloy";
+import { HighlightType, MalloyTranslator } from "@malloy-lang/malloy";
 import {
   SemanticTokens,
   SemanticTokensBuilder,
diff --git a/packages/malloy-vscode/src/server/lenses/lenses.ts b/packages/malloy-vscode/src/server/lenses/lenses.ts
index a8e8248fc..4037979d6 100644
--- a/packages/malloy-vscode/src/server/lenses/lenses.ts
+++ b/packages/malloy-vscode/src/server/lenses/lenses.ts
@@ -12,7 +12,7 @@
  */
 
 import { CodeLens } from "vscode-languageserver/node";
-import { MalloyTranslator } from "malloy";
+import { MalloyTranslator } from "@malloy-lang/malloy";
 import { TextDocument } from "vscode-languageserver-textdocument";
 
 const explain = `
diff --git a/packages/malloy-vscode/src/server/symbols/symbols.ts b/packages/malloy-vscode/src/server/symbols/symbols.ts
index 00786e032..4b6977c7d 100644
--- a/packages/malloy-vscode/src/server/symbols/symbols.ts
+++ b/packages/malloy-vscode/src/server/symbols/symbols.ts
@@ -15,7 +15,7 @@ import { TextDocument } from "vscode-languageserver-textdocument";
 import {
   DocumentSymbol as MalloyDocumentSymbol,
   MalloyTranslator,
-} from "malloy";
+} from "@malloy-lang/malloy";
 import { DocumentSymbol, SymbolKind } from "vscode-languageserver/node";
 
 function mapSymbol(symbol: MalloyDocumentSymbol): DocumentSymbol {
diff --git a/packages/malloy/package.json b/packages/malloy/package.json
index 67978cd18..c12720753 100644
--- a/packages/malloy/package.json
+++ b/packages/malloy/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "malloy",
+  "name": "@malloy-lang/malloy",
   "version": "0.0.1",
   "license": "GPL-2.0",
   "main": "dist/index.js",
diff --git a/packages/malloy/src/dialect/standardsql.ts b/packages/malloy/src/dialect/standardsql.ts
index 7f8c932a9..c3566d50d 100644
--- a/packages/malloy/src/dialect/standardsql.ts
+++ b/packages/malloy/src/dialect/standardsql.ts
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-import { indent } from "malloy/src/model/utils";
+import { indent } from "../model/utils";
 import { Dialect, DialectFieldList } from "./dialect";
 
 export class StandardSQLDialect extends Dialect {