diff --git a/edn/Cargo.toml b/edn/Cargo.toml
index 288f1bf3..c5629952 100644
--- a/edn/Cargo.toml
+++ b/edn/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.1.0"
 authors = ["Joe Walker <jwalker@mozilla.com>"]
 
 license = "Apache-2.0"
-repository = "https://github.com/mozilla/datomish"
-description = "EDN Parser for Datomish"
+repository = "https://github.com/mozilla/mentat"
+description = "EDN parser for Project Mentat"
 build = "build.rs"
 readme = "./README.md"
 
diff --git a/edn/README.md b/edn/README.md
index 97b111b0..3f306011 100644
--- a/edn/README.md
+++ b/edn/README.md
@@ -1,2 +1,2 @@
 # barnardsstar
-An experimental EDN parser for Datomish
+An experimental EDN parser for Project Mentat.
diff --git a/edn/src/edn.rustpeg b/edn/src/edn.rustpeg
index cdd17e5a..0b7aa2f2 100644
--- a/edn/src/edn.rustpeg
+++ b/edn/src/edn.rustpeg
@@ -1,3 +1,5 @@
+/* vim: set filetype=rust.rustpeg */
+
 // Copyright 2016 Mozilla
 //
 // Licensed under the Apache License, Version 2.0 (the "License"); you may not use
diff --git a/edn/src/lib.rs b/edn/src/lib.rs
index 7880094c..43b112ef 100644
--- a/edn/src/lib.rs
+++ b/edn/src/lib.rs
@@ -13,12 +13,9 @@
 extern crate ordered_float;
 extern crate num;
 
+pub mod keyword;
 pub mod types;
 
 pub mod parse {
     include!(concat!(env!("OUT_DIR"), "/edn.rs"));
 }
-
-fn main() {
-    println!("Use cargo test");
-}
diff --git a/edn/tests/tests.rs b/edn/tests/tests.rs
index e198479b..a8887e88 100644
--- a/edn/tests/tests.rs
+++ b/edn/tests/tests.rs
@@ -8,7 +8,7 @@
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
 // specific language governing permissions and limitations under the License.
 
-extern crate datomish_edn;
+extern crate edn;
 extern crate num;
 extern crate ordered_float;
 
@@ -17,8 +17,8 @@ use std::iter::FromIterator;
 use num::bigint::ToBigInt;
 use num::traits::{Zero, One};
 use ordered_float::OrderedFloat;
-use datomish_edn::types::Value::*;
-use datomish_edn::parse::*;
+use edn::types::Value::*;
+use edn::parse::*;
 
 #[test]
 fn test_nil() {
@@ -355,7 +355,7 @@ fn test_map() {
     assert!(map("#{1 #{2 nil} \"hi\"").is_err());
 }
 
-/// The test_query_* functions contain the queries taken from the old clojure datomish.
+/// The test_query_* functions contain the queries taken from the old Clojure implementation of Mentat.
 /// 2 changes have been applied, which should be checked and maybe fixed
 /// TODO: Decide if these queries should be placed in a vector wrapper. Is that implied?
 /// Secondly, see note in test_query_starred_pages on the use of '