diff --git a/Cargo.lock b/Cargo.lock
index c0b060aeaf..6a33568943 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -991,7 +991,7 @@ dependencies = [
  "ra_arena 0.1.0",
  "ra_cfg 0.1.0",
  "ra_db 0.1.0",
- "ra_hir_def 0.1.0",
+ "ra_hir_expand 0.1.0",
  "ra_mbe 0.1.0",
  "ra_prof 0.1.0",
  "ra_syntax 0.1.0",
@@ -1002,7 +1002,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "ra_hir_def"
+name = "ra_hir_expand"
 version = "0.1.0"
 dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index 82720da9e2..2090f3b207 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -19,7 +19,7 @@ ra_cfg = { path = "../ra_cfg" }
 ra_db = { path = "../ra_db" }
 mbe = { path = "../ra_mbe", package = "ra_mbe" }
 tt = { path = "../ra_tt", package = "ra_tt" }
-hir_def = { path = "../ra_hir_def", package = "ra_hir_def" }
+hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" }
 test_utils = { path = "../test_utils" }
 ra_prof = { path = "../ra_prof" }
 
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index a8fd695c0d..6d34c671dc 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -23,7 +23,7 @@ use crate::{
     Static, Struct, StructField, Trait, TypeAlias,
 };
 
-pub use hir_def::db::{
+pub use hir_expand::db::{
     AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery,
     ParseMacroQuery,
 };
diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs
index 9f85bb30d2..eb2d234099 100644
--- a/crates/ra_hir/src/ids.rs
+++ b/crates/ra_hir/src/ids.rs
@@ -15,7 +15,7 @@ use crate::{
     AstId, FileAstId, Module, Source,
 };
 
-pub use hir_def::expand::{
+pub use hir_expand::expand::{
     HirFileId, MacroCallId, MacroCallLoc, MacroDefId, MacroFile, MacroFileKind,
 };
 
diff --git a/crates/ra_hir/src/source_id.rs b/crates/ra_hir/src/source_id.rs
index c70245949b..b37474418f 100644
--- a/crates/ra_hir/src/source_id.rs
+++ b/crates/ra_hir/src/source_id.rs
@@ -1,6 +1,6 @@
 //! FIXME: write short doc here
 
-pub use hir_def::{
+pub use hir_expand::{
     ast_id_map::{AstIdMap, ErasedFileAstId, FileAstId},
     expand::AstId,
 };
diff --git a/crates/ra_hir_def/Cargo.toml b/crates/ra_hir_expand/Cargo.toml
similarity index 93%
rename from crates/ra_hir_def/Cargo.toml
rename to crates/ra_hir_expand/Cargo.toml
index 049f8a4fc6..9bf5b79187 100644
--- a/crates/ra_hir_def/Cargo.toml
+++ b/crates/ra_hir_expand/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 edition = "2018"
-name = "ra_hir_def"
+name = "ra_hir_expand"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 
diff --git a/crates/ra_hir_def/src/ast_id_map.rs b/crates/ra_hir_expand/src/ast_id_map.rs
similarity index 100%
rename from crates/ra_hir_def/src/ast_id_map.rs
rename to crates/ra_hir_expand/src/ast_id_map.rs
diff --git a/crates/ra_hir_def/src/db.rs b/crates/ra_hir_expand/src/db.rs
similarity index 100%
rename from crates/ra_hir_def/src/db.rs
rename to crates/ra_hir_expand/src/db.rs
diff --git a/crates/ra_hir_def/src/expand.rs b/crates/ra_hir_expand/src/expand.rs
similarity index 100%
rename from crates/ra_hir_def/src/expand.rs
rename to crates/ra_hir_expand/src/expand.rs
diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_expand/src/lib.rs
similarity index 100%
rename from crates/ra_hir_def/src/lib.rs
rename to crates/ra_hir_expand/src/lib.rs