diff --git a/packages/foam-cli/package.json b/packages/foam-cli/package.json
index 6e7fa0e7..55367ec3 100644
--- a/packages/foam-cli/package.json
+++ b/packages/foam-cli/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@foam/cli",
+  "name": "foam-cli",
   "description": "Foam CLI",
   "version": "0.1.0",
   "author": "Jani Eväkallio @jevakallio",
@@ -23,10 +23,10 @@
     "globby": "^10",
     "ts-node": "^8",
     "typescript": "^3.3",
-    "@foam/core": "^0.1.1"
+    "foam-core": "^0.1.1"
   },
   "peerDependencies": {
-    "@foam/core": "^0.1.1"
+    "foam-core": "^0.1.1"
   },
   "engines": {
     "node": ">=8.0.0"
diff --git a/packages/foam-cli/src/commands/hello.ts b/packages/foam-cli/src/commands/hello.ts
index e74fd145..30b70b90 100644
--- a/packages/foam-cli/src/commands/hello.ts
+++ b/packages/foam-cli/src/commands/hello.ts
@@ -1,5 +1,5 @@
 import {Command, flags} from '@oclif/command'
-import { NoteGraph } from '@foam/core';
+import { NoteGraph } from 'foam-core';
 export default class Hello extends Command {
   static description = 'describe the command here'
 
@@ -23,19 +23,19 @@ hello world from ./src/hello.ts!
     const {args, flags} = this.parse(Hello)
     const name = flags.name ?? 'world'
 
-    const wm = new NoteGraph();
-    wm.addNoteFromMarkdown('page-a.md', `
-# Page A
-## Section
-- [[page-b]]
-- [[page-c]];
-    `);
+//     const wm = new NoteGraph();
+//     wm.addNoteFromMarkdown('page-a.md', `
+// # Page A
+// ## Section
+// - [[page-b]]
+// - [[page-c]];
+//     `);
 
-    wm.addNoteFromMarkdown('page-a.md', `
-# Page B
-This references [[page-a]]`);
+//     wm.addNoteFromMarkdown('page-a.md', `
+// # Page B
+// This references [[page-a]]`);
 
-    console.log(wm.getNoteWithLinks('page-a'));
+//     console.log(wm.getNoteWithLinks('page-a'));
 
 
 
diff --git a/packages/foam-core/package.json b/packages/foam-core/package.json
index 4af30a4f..65795a69 100644
--- a/packages/foam-core/package.json
+++ b/packages/foam-core/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@foam/core",
+  "name": "foam-core",
   "author": "Jani Eväkallio",
   "repository": "https://github.com/foambubble/foam",
   "version": "0.1.1",
diff --git a/packages/foam-vscode/package.json b/packages/foam-vscode/package.json
index 4b9ceec8..de6c1e18 100644
--- a/packages/foam-vscode/package.json
+++ b/packages/foam-vscode/package.json
@@ -49,6 +49,6 @@
     "vscode-test": "^1.3.0"
   },
   "dependencies": {
-    "@foam/core": "^0.1.1"
+    "foam-core": "^0.1.1"
   }
 }
diff --git a/packages/foam-vscode/src/extension.ts b/packages/foam-vscode/src/extension.ts
index 3c401981..3f77ee0a 100644
--- a/packages/foam-vscode/src/extension.ts
+++ b/packages/foam-vscode/src/extension.ts
@@ -22,7 +22,7 @@ import {
   Position,
 } from "vscode";
 
-import { createMarkdownReferences, createNoteFromMarkdown } from '@foam/core'
+import { createMarkdownReferences, createNoteFromMarkdown } from 'foam-core'
 import { basename, dirname, relative } from "path";
 import * as ws from "./workspace";
 import { config } from 'process';
diff --git a/packages/foam-vscode/src/workspace.ts b/packages/foam-vscode/src/workspace.ts
index f98c1a8b..75b02625 100644
--- a/packages/foam-vscode/src/workspace.ts
+++ b/packages/foam-vscode/src/workspace.ts
@@ -1,7 +1,7 @@
 import * as fs from "fs";
 import { basename } from "path";
 import { workspace } from "vscode";
-import { NoteGraph, createNoteFromMarkdown } from "@foam/core";
+import { NoteGraph, createNoteFromMarkdown } from "foam-core";
 
 // build initial index
 export const ready = (async () => {
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 1e9b00b0..3137ef72 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -5,8 +5,8 @@
     "declarationMap": true,
     "baseUrl": ".",
     "paths": {
-      "@foam/core": ["./packages/foam-core/src"],
-      "@foam/cli": ["./packages/foam-cli/src"],
+      "foam-core": ["./packages/foam-core/src"],
+      "foam-cli": ["./packages/foam-cli/src"],
       "foam-vscode": ["./packages/foam-vscode/src"]
     }
   }