diff --git a/.travis.yml b/.travis.yml
index 68c2c468..23396e14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,5 +2,5 @@ language: rust
 script:
   - cargo build --verbose
   - cargo test --verbose
-  - cargo test --verbose -p datomish-parser
+  - cargo test --verbose -p datomish-query-parser
   - cargo test --verbose -p datomish-cli
\ No newline at end of file
diff --git a/Cargo.toml b/Cargo.toml
index b96bf505..b0ec7ca3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.4.0"
 authors = ["Richard Newman <rnewman@twinql.com>", "Nicholas Alexander <nalexander@mozilla.com>"]
 
 [dependencies]
-[dependencies.datomish-parser]
-  path = "parser"
+[dependencies.datomish-query-parser]
+  path = "query-parser"
 
 [dev-dependencies]
 [dev-dependencies.datomish-cli]
diff --git a/parser/Cargo.toml b/parser/Cargo.toml
deleted file mode 100644
index 406c3e06..00000000
--- a/parser/Cargo.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[package]
-name = "datomish-parser"
-version = "0.0.1"
\ No newline at end of file
diff --git a/query-parser/Cargo.toml b/query-parser/Cargo.toml
new file mode 100644
index 00000000..a17d9c6c
--- /dev/null
+++ b/query-parser/Cargo.toml
@@ -0,0 +1,3 @@
+[package]
+name = "datomish-query-parser"
+version = "0.0.1"
\ No newline at end of file
diff --git a/parser/src/lib.rs b/query-parser/src/lib.rs
similarity index 85%
rename from parser/src/lib.rs
rename to query-parser/src/lib.rs
index 0c78b2b3..952491a8 100644
--- a/parser/src/lib.rs
+++ b/query-parser/src/lib.rs
@@ -10,7 +10,7 @@
 
 // This file is just a stub
 pub fn get_name() -> String {
-  return String::from("datomish-parser");
+  return String::from("datomish-query-parser");
 }
 
 #[cfg(test)]
@@ -19,6 +19,6 @@ mod tests {
 
     #[test]
     fn it_works() {
-        assert_eq!(String::from("datomish-parser"), get_name());
+        assert_eq!(String::from("datomish-query-parser"), get_name());
     }
 }
\ No newline at end of file
diff --git a/src/lib.rs b/src/lib.rs
index 5cbe61ec..2c4086f2 100644
--- a/src/lib.rs
+++ b/src/lib.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_parser;
+extern crate datomish_query_parser;
 
 pub fn get_name() -> String {
   return String::from("datomish");
@@ -16,7 +16,7 @@ pub fn get_name() -> String {
 
 // Just an example of using a dependency
 pub fn get_parser_name() -> String {
-  return datomish_parser::get_name();
+  return datomish_query_parser::get_name();
 }
 
 pub fn add_two(a: i32) -> i32 {
@@ -34,6 +34,6 @@ mod tests {
 
     #[test]
     fn can_import_parser() {
-        assert_eq!(String::from("datomish-parser"), get_parser_name());
+        assert_eq!(String::from("datomish-query-parser"), get_parser_name());
     }
 }
\ No newline at end of file