diff --git a/Cargo.lock b/Cargo.lock
index f047b4508d1..477440f5fd3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -53,23 +53,6 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
-[[package]]
-name = "assists"
-version = "0.0.0"
-dependencies = [
- "either",
- "expect-test",
- "hir",
- "ide_db",
- "itertools 0.10.0",
- "profile",
- "rustc-hash",
- "stdx",
- "syntax",
- "test_utils",
- "text_edit",
-]
-
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -602,11 +585,11 @@ dependencies = [
 name = "ide"
 version = "0.0.0"
 dependencies = [
- "assists",
  "cfg",
  "either",
  "expect-test",
  "hir",
+ "ide_assists",
  "ide_completion",
  "ide_db",
  "indexmap",
@@ -625,6 +608,23 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "ide_assists"
+version = "0.0.0"
+dependencies = [
+ "either",
+ "expect-test",
+ "hir",
+ "ide_db",
+ "itertools 0.10.0",
+ "profile",
+ "rustc-hash",
+ "stdx",
+ "syntax",
+ "test_utils",
+ "text_edit",
+]
+
 [[package]]
 name = "ide_completion"
 version = "0.0.0"
diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml
index 3cbe3a39749..b7152c83926 100644
--- a/crates/ide/Cargo.toml
+++ b/crates/ide/Cargo.toml
@@ -27,7 +27,7 @@ ide_db = { path = "../ide_db", version = "0.0.0" }
 cfg = { path = "../cfg", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
 test_utils = { path = "../test_utils", version = "0.0.0" }
-assists = { path = "../assists", version = "0.0.0" }
+ide_assists = { path = "../ide_assists", version = "0.0.0" }
 ssr = { path = "../ssr", version = "0.0.0" }
 ide_completion = { path = "../ide_completion", version = "0.0.0" }
 
diff --git a/crates/ide/src/fn_references.rs b/crates/ide/src/fn_references.rs
index f6e5a522b4e..1a99a1f3712 100644
--- a/crates/ide/src/fn_references.rs
+++ b/crates/ide/src/fn_references.rs
@@ -1,8 +1,8 @@
 //! This module implements a methods and free functions search in the specified file.
 //! We have to skip tests, so cannot reuse file_structure module.
 
-use assists::utils::test_related_attribute;
 use hir::Semantics;
+use ide_assists::utils::test_related_attribute;
 use ide_db::RootDatabase;
 use syntax::{ast, ast::NameOwner, AstNode, SyntaxNode};
 
diff --git a/crates/ide/src/join_lines.rs b/crates/ide/src/join_lines.rs
index e3f3985d148..2c077ed1fc2 100644
--- a/crates/ide/src/join_lines.rs
+++ b/crates/ide/src/join_lines.rs
@@ -1,4 +1,4 @@
-use assists::utils::extract_trivial_expression;
+use ide_assists::utils::extract_trivial_expression;
 use itertools::Itertools;
 use syntax::{
     algo::non_trivia_sibling,
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index f47ec61fe41..eb26d13b91a 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -82,8 +82,8 @@ pub use crate::{
         HlRange,
     },
 };
-pub use assists::{Assist, AssistConfig, AssistId, AssistKind};
 pub use hir::{Documentation, Semantics};
+pub use ide_assists::{Assist, AssistConfig, AssistId, AssistKind};
 pub use ide_completion::{
     CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, ImportEdit,
     InsertTextFormat,
diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs
index 33170906d86..1e7baed2046 100644
--- a/crates/ide/src/runnables.rs
+++ b/crates/ide/src/runnables.rs
@@ -1,8 +1,8 @@
 use std::fmt;
 
-use assists::utils::test_related_attribute;
 use cfg::CfgExpr;
 use hir::{AsAssocItem, HasAttrs, HasSource, Semantics};
+use ide_assists::utils::test_related_attribute;
 use ide_db::{defs::Definition, RootDatabase, SymbolKind};
 use itertools::Itertools;
 use syntax::{
diff --git a/crates/assists/Cargo.toml b/crates/ide_assists/Cargo.toml
similarity index 96%
rename from crates/assists/Cargo.toml
rename to crates/ide_assists/Cargo.toml
index c78cb99afe2..a34bdd6c3a0 100644
--- a/crates/assists/Cargo.toml
+++ b/crates/ide_assists/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "assists"
+name = "ide_assists"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
diff --git a/crates/assists/src/assist_config.rs b/crates/ide_assists/src/assist_config.rs
similarity index 100%
rename from crates/assists/src/assist_config.rs
rename to crates/ide_assists/src/assist_config.rs
diff --git a/crates/assists/src/assist_context.rs b/crates/ide_assists/src/assist_context.rs
similarity index 100%
rename from crates/assists/src/assist_context.rs
rename to crates/ide_assists/src/assist_context.rs
diff --git a/crates/assists/src/ast_transform.rs b/crates/ide_assists/src/ast_transform.rs
similarity index 100%
rename from crates/assists/src/ast_transform.rs
rename to crates/ide_assists/src/ast_transform.rs
diff --git a/crates/assists/src/handlers/add_explicit_type.rs b/crates/ide_assists/src/handlers/add_explicit_type.rs
similarity index 100%
rename from crates/assists/src/handlers/add_explicit_type.rs
rename to crates/ide_assists/src/handlers/add_explicit_type.rs
diff --git a/crates/assists/src/handlers/add_lifetime_to_type.rs b/crates/ide_assists/src/handlers/add_lifetime_to_type.rs
similarity index 100%
rename from crates/assists/src/handlers/add_lifetime_to_type.rs
rename to crates/ide_assists/src/handlers/add_lifetime_to_type.rs
diff --git a/crates/assists/src/handlers/add_missing_impl_members.rs b/crates/ide_assists/src/handlers/add_missing_impl_members.rs
similarity index 100%
rename from crates/assists/src/handlers/add_missing_impl_members.rs
rename to crates/ide_assists/src/handlers/add_missing_impl_members.rs
diff --git a/crates/assists/src/handlers/add_turbo_fish.rs b/crates/ide_assists/src/handlers/add_turbo_fish.rs
similarity index 100%
rename from crates/assists/src/handlers/add_turbo_fish.rs
rename to crates/ide_assists/src/handlers/add_turbo_fish.rs
diff --git a/crates/assists/src/handlers/apply_demorgan.rs b/crates/ide_assists/src/handlers/apply_demorgan.rs
similarity index 100%
rename from crates/assists/src/handlers/apply_demorgan.rs
rename to crates/ide_assists/src/handlers/apply_demorgan.rs
diff --git a/crates/assists/src/handlers/auto_import.rs b/crates/ide_assists/src/handlers/auto_import.rs
similarity index 100%
rename from crates/assists/src/handlers/auto_import.rs
rename to crates/ide_assists/src/handlers/auto_import.rs
diff --git a/crates/assists/src/handlers/change_visibility.rs b/crates/ide_assists/src/handlers/change_visibility.rs
similarity index 100%
rename from crates/assists/src/handlers/change_visibility.rs
rename to crates/ide_assists/src/handlers/change_visibility.rs
diff --git a/crates/assists/src/handlers/convert_integer_literal.rs b/crates/ide_assists/src/handlers/convert_integer_literal.rs
similarity index 100%
rename from crates/assists/src/handlers/convert_integer_literal.rs
rename to crates/ide_assists/src/handlers/convert_integer_literal.rs
diff --git a/crates/assists/src/handlers/early_return.rs b/crates/ide_assists/src/handlers/early_return.rs
similarity index 100%
rename from crates/assists/src/handlers/early_return.rs
rename to crates/ide_assists/src/handlers/early_return.rs
diff --git a/crates/assists/src/handlers/expand_glob_import.rs b/crates/ide_assists/src/handlers/expand_glob_import.rs
similarity index 100%
rename from crates/assists/src/handlers/expand_glob_import.rs
rename to crates/ide_assists/src/handlers/expand_glob_import.rs
diff --git a/crates/assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs
similarity index 100%
rename from crates/assists/src/handlers/extract_function.rs
rename to crates/ide_assists/src/handlers/extract_function.rs
diff --git a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
similarity index 100%
rename from crates/assists/src/handlers/extract_struct_from_enum_variant.rs
rename to crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
diff --git a/crates/assists/src/handlers/extract_variable.rs b/crates/ide_assists/src/handlers/extract_variable.rs
similarity index 100%
rename from crates/assists/src/handlers/extract_variable.rs
rename to crates/ide_assists/src/handlers/extract_variable.rs
diff --git a/crates/assists/src/handlers/fill_match_arms.rs b/crates/ide_assists/src/handlers/fill_match_arms.rs
similarity index 100%
rename from crates/assists/src/handlers/fill_match_arms.rs
rename to crates/ide_assists/src/handlers/fill_match_arms.rs
diff --git a/crates/assists/src/handlers/fix_visibility.rs b/crates/ide_assists/src/handlers/fix_visibility.rs
similarity index 100%
rename from crates/assists/src/handlers/fix_visibility.rs
rename to crates/ide_assists/src/handlers/fix_visibility.rs
diff --git a/crates/assists/src/handlers/flip_binexpr.rs b/crates/ide_assists/src/handlers/flip_binexpr.rs
similarity index 100%
rename from crates/assists/src/handlers/flip_binexpr.rs
rename to crates/ide_assists/src/handlers/flip_binexpr.rs
diff --git a/crates/assists/src/handlers/flip_comma.rs b/crates/ide_assists/src/handlers/flip_comma.rs
similarity index 100%
rename from crates/assists/src/handlers/flip_comma.rs
rename to crates/ide_assists/src/handlers/flip_comma.rs
diff --git a/crates/assists/src/handlers/flip_trait_bound.rs b/crates/ide_assists/src/handlers/flip_trait_bound.rs
similarity index 100%
rename from crates/assists/src/handlers/flip_trait_bound.rs
rename to crates/ide_assists/src/handlers/flip_trait_bound.rs
diff --git a/crates/assists/src/handlers/generate_default_from_enum_variant.rs b/crates/ide_assists/src/handlers/generate_default_from_enum_variant.rs
similarity index 100%
rename from crates/assists/src/handlers/generate_default_from_enum_variant.rs
rename to crates/ide_assists/src/handlers/generate_default_from_enum_variant.rs
diff --git a/crates/assists/src/handlers/generate_derive.rs b/crates/ide_assists/src/handlers/generate_derive.rs
similarity index 100%
rename from crates/assists/src/handlers/generate_derive.rs
rename to crates/ide_assists/src/handlers/generate_derive.rs
diff --git a/crates/assists/src/handlers/generate_enum_match_method.rs b/crates/ide_assists/src/handlers/generate_enum_match_method.rs
similarity index 100%
rename from crates/assists/src/handlers/generate_enum_match_method.rs
rename to crates/ide_assists/src/handlers/generate_enum_match_method.rs
diff --git a/crates/assists/src/handlers/generate_from_impl_for_enum.rs b/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs
similarity index 100%
rename from crates/assists/src/handlers/generate_from_impl_for_enum.rs
rename to crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs
diff --git a/crates/assists/src/handlers/generate_function.rs b/crates/ide_assists/src/handlers/generate_function.rs
similarity index 100%
rename from crates/assists/src/handlers/generate_function.rs
rename to crates/ide_assists/src/handlers/generate_function.rs
diff --git a/crates/assists/src/handlers/generate_getter.rs b/crates/ide_assists/src/handlers/generate_getter.rs
similarity index 100%
rename from crates/assists/src/handlers/generate_getter.rs
rename to crates/ide_assists/src/handlers/generate_getter.rs
diff --git a/crates/assists/src/handlers/generate_getter_mut.rs b/crates/ide_assists/src/handlers/generate_getter_mut.rs
similarity index 100%
rename from crates/assists/src/handlers/generate_getter_mut.rs
rename to crates/ide_assists/src/handlers/generate_getter_mut.rs
diff --git a/crates/assists/src/handlers/generate_impl.rs b/crates/ide_assists/src/handlers/generate_impl.rs
similarity index 100%
rename from crates/assists/src/handlers/generate_impl.rs
rename to crates/ide_assists/src/handlers/generate_impl.rs
diff --git a/crates/assists/src/handlers/generate_new.rs b/crates/ide_assists/src/handlers/generate_new.rs
similarity index 100%
rename from crates/assists/src/handlers/generate_new.rs
rename to crates/ide_assists/src/handlers/generate_new.rs
diff --git a/crates/assists/src/handlers/generate_setter.rs b/crates/ide_assists/src/handlers/generate_setter.rs
similarity index 100%
rename from crates/assists/src/handlers/generate_setter.rs
rename to crates/ide_assists/src/handlers/generate_setter.rs
diff --git a/crates/assists/src/handlers/infer_function_return_type.rs b/crates/ide_assists/src/handlers/infer_function_return_type.rs
similarity index 100%
rename from crates/assists/src/handlers/infer_function_return_type.rs
rename to crates/ide_assists/src/handlers/infer_function_return_type.rs
diff --git a/crates/assists/src/handlers/inline_function.rs b/crates/ide_assists/src/handlers/inline_function.rs
similarity index 100%
rename from crates/assists/src/handlers/inline_function.rs
rename to crates/ide_assists/src/handlers/inline_function.rs
diff --git a/crates/assists/src/handlers/inline_local_variable.rs b/crates/ide_assists/src/handlers/inline_local_variable.rs
similarity index 100%
rename from crates/assists/src/handlers/inline_local_variable.rs
rename to crates/ide_assists/src/handlers/inline_local_variable.rs
diff --git a/crates/assists/src/handlers/introduce_named_lifetime.rs b/crates/ide_assists/src/handlers/introduce_named_lifetime.rs
similarity index 100%
rename from crates/assists/src/handlers/introduce_named_lifetime.rs
rename to crates/ide_assists/src/handlers/introduce_named_lifetime.rs
diff --git a/crates/assists/src/handlers/invert_if.rs b/crates/ide_assists/src/handlers/invert_if.rs
similarity index 100%
rename from crates/assists/src/handlers/invert_if.rs
rename to crates/ide_assists/src/handlers/invert_if.rs
diff --git a/crates/assists/src/handlers/merge_imports.rs b/crates/ide_assists/src/handlers/merge_imports.rs
similarity index 100%
rename from crates/assists/src/handlers/merge_imports.rs
rename to crates/ide_assists/src/handlers/merge_imports.rs
diff --git a/crates/assists/src/handlers/merge_match_arms.rs b/crates/ide_assists/src/handlers/merge_match_arms.rs
similarity index 100%
rename from crates/assists/src/handlers/merge_match_arms.rs
rename to crates/ide_assists/src/handlers/merge_match_arms.rs
diff --git a/crates/assists/src/handlers/move_bounds.rs b/crates/ide_assists/src/handlers/move_bounds.rs
similarity index 100%
rename from crates/assists/src/handlers/move_bounds.rs
rename to crates/ide_assists/src/handlers/move_bounds.rs
diff --git a/crates/assists/src/handlers/move_guard.rs b/crates/ide_assists/src/handlers/move_guard.rs
similarity index 100%
rename from crates/assists/src/handlers/move_guard.rs
rename to crates/ide_assists/src/handlers/move_guard.rs
diff --git a/crates/assists/src/handlers/move_module_to_file.rs b/crates/ide_assists/src/handlers/move_module_to_file.rs
similarity index 100%
rename from crates/assists/src/handlers/move_module_to_file.rs
rename to crates/ide_assists/src/handlers/move_module_to_file.rs
diff --git a/crates/assists/src/handlers/pull_assignment_up.rs b/crates/ide_assists/src/handlers/pull_assignment_up.rs
similarity index 100%
rename from crates/assists/src/handlers/pull_assignment_up.rs
rename to crates/ide_assists/src/handlers/pull_assignment_up.rs
diff --git a/crates/assists/src/handlers/qualify_path.rs b/crates/ide_assists/src/handlers/qualify_path.rs
similarity index 100%
rename from crates/assists/src/handlers/qualify_path.rs
rename to crates/ide_assists/src/handlers/qualify_path.rs
diff --git a/crates/assists/src/handlers/raw_string.rs b/crates/ide_assists/src/handlers/raw_string.rs
similarity index 100%
rename from crates/assists/src/handlers/raw_string.rs
rename to crates/ide_assists/src/handlers/raw_string.rs
diff --git a/crates/assists/src/handlers/remove_dbg.rs b/crates/ide_assists/src/handlers/remove_dbg.rs
similarity index 100%
rename from crates/assists/src/handlers/remove_dbg.rs
rename to crates/ide_assists/src/handlers/remove_dbg.rs
diff --git a/crates/assists/src/handlers/remove_mut.rs b/crates/ide_assists/src/handlers/remove_mut.rs
similarity index 100%
rename from crates/assists/src/handlers/remove_mut.rs
rename to crates/ide_assists/src/handlers/remove_mut.rs
diff --git a/crates/assists/src/handlers/remove_unused_param.rs b/crates/ide_assists/src/handlers/remove_unused_param.rs
similarity index 100%
rename from crates/assists/src/handlers/remove_unused_param.rs
rename to crates/ide_assists/src/handlers/remove_unused_param.rs
diff --git a/crates/assists/src/handlers/reorder_fields.rs b/crates/ide_assists/src/handlers/reorder_fields.rs
similarity index 100%
rename from crates/assists/src/handlers/reorder_fields.rs
rename to crates/ide_assists/src/handlers/reorder_fields.rs
diff --git a/crates/assists/src/handlers/reorder_impl.rs b/crates/ide_assists/src/handlers/reorder_impl.rs
similarity index 100%
rename from crates/assists/src/handlers/reorder_impl.rs
rename to crates/ide_assists/src/handlers/reorder_impl.rs
diff --git a/crates/assists/src/handlers/replace_derive_with_manual_impl.rs b/crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs
similarity index 100%
rename from crates/assists/src/handlers/replace_derive_with_manual_impl.rs
rename to crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs
diff --git a/crates/assists/src/handlers/replace_if_let_with_match.rs b/crates/ide_assists/src/handlers/replace_if_let_with_match.rs
similarity index 100%
rename from crates/assists/src/handlers/replace_if_let_with_match.rs
rename to crates/ide_assists/src/handlers/replace_if_let_with_match.rs
diff --git a/crates/assists/src/handlers/replace_impl_trait_with_generic.rs b/crates/ide_assists/src/handlers/replace_impl_trait_with_generic.rs
similarity index 100%
rename from crates/assists/src/handlers/replace_impl_trait_with_generic.rs
rename to crates/ide_assists/src/handlers/replace_impl_trait_with_generic.rs
diff --git a/crates/assists/src/handlers/replace_let_with_if_let.rs b/crates/ide_assists/src/handlers/replace_let_with_if_let.rs
similarity index 100%
rename from crates/assists/src/handlers/replace_let_with_if_let.rs
rename to crates/ide_assists/src/handlers/replace_let_with_if_let.rs
diff --git a/crates/assists/src/handlers/replace_qualified_name_with_use.rs b/crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs
similarity index 100%
rename from crates/assists/src/handlers/replace_qualified_name_with_use.rs
rename to crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs
diff --git a/crates/assists/src/handlers/replace_string_with_char.rs b/crates/ide_assists/src/handlers/replace_string_with_char.rs
similarity index 100%
rename from crates/assists/src/handlers/replace_string_with_char.rs
rename to crates/ide_assists/src/handlers/replace_string_with_char.rs
diff --git a/crates/assists/src/handlers/replace_unwrap_with_match.rs b/crates/ide_assists/src/handlers/replace_unwrap_with_match.rs
similarity index 100%
rename from crates/assists/src/handlers/replace_unwrap_with_match.rs
rename to crates/ide_assists/src/handlers/replace_unwrap_with_match.rs
diff --git a/crates/assists/src/handlers/split_import.rs b/crates/ide_assists/src/handlers/split_import.rs
similarity index 100%
rename from crates/assists/src/handlers/split_import.rs
rename to crates/ide_assists/src/handlers/split_import.rs
diff --git a/crates/assists/src/handlers/toggle_ignore.rs b/crates/ide_assists/src/handlers/toggle_ignore.rs
similarity index 100%
rename from crates/assists/src/handlers/toggle_ignore.rs
rename to crates/ide_assists/src/handlers/toggle_ignore.rs
diff --git a/crates/assists/src/handlers/unmerge_use.rs b/crates/ide_assists/src/handlers/unmerge_use.rs
similarity index 100%
rename from crates/assists/src/handlers/unmerge_use.rs
rename to crates/ide_assists/src/handlers/unmerge_use.rs
diff --git a/crates/assists/src/handlers/unwrap_block.rs b/crates/ide_assists/src/handlers/unwrap_block.rs
similarity index 100%
rename from crates/assists/src/handlers/unwrap_block.rs
rename to crates/ide_assists/src/handlers/unwrap_block.rs
diff --git a/crates/assists/src/handlers/wrap_return_type_in_result.rs b/crates/ide_assists/src/handlers/wrap_return_type_in_result.rs
similarity index 100%
rename from crates/assists/src/handlers/wrap_return_type_in_result.rs
rename to crates/ide_assists/src/handlers/wrap_return_type_in_result.rs
diff --git a/crates/assists/src/lib.rs b/crates/ide_assists/src/lib.rs
similarity index 100%
rename from crates/assists/src/lib.rs
rename to crates/ide_assists/src/lib.rs
diff --git a/crates/assists/src/tests.rs b/crates/ide_assists/src/tests.rs
similarity index 100%
rename from crates/assists/src/tests.rs
rename to crates/ide_assists/src/tests.rs
diff --git a/crates/assists/src/tests/generated.rs b/crates/ide_assists/src/tests/generated.rs
similarity index 100%
rename from crates/assists/src/tests/generated.rs
rename to crates/ide_assists/src/tests/generated.rs
diff --git a/crates/assists/src/utils.rs b/crates/ide_assists/src/utils.rs
similarity index 100%
rename from crates/assists/src/utils.rs
rename to crates/ide_assists/src/utils.rs
diff --git a/xtask/src/codegen/gen_assists_docs.rs b/xtask/src/codegen/gen_assists_docs.rs
index 51f58180c61..1ae1343a565 100644
--- a/xtask/src/codegen/gen_assists_docs.rs
+++ b/xtask/src/codegen/gen_assists_docs.rs
@@ -32,7 +32,7 @@ struct Assist {
 impl Assist {
     fn collect() -> Result<Vec<Assist>> {
         let mut res = Vec::new();
-        for path in rust_files_in(&project_root().join("crates/assists/src/handlers")) {
+        for path in rust_files_in(&project_root().join("crates/ide_assists/src/handlers")) {
             collect_file(&mut res, path.as_path())?;
         }
         res.sort_by(|lhs, rhs| lhs.id.cmp(&rhs.id));
@@ -135,7 +135,7 @@ r#####"
         buf.push_str(&test)
     }
     let buf = reformat(&buf)?;
-    codegen::update(&project_root().join("crates/assists/src/tests/generated.rs"), &buf, mode)
+    codegen::update(&project_root().join("crates/ide_assists/src/tests/generated.rs"), &buf, mode)
 }
 
 fn hide_hash_comments(text: &str) -> String {