diff --git a/cabal.project b/cabal.project
index 456a57cc92..8134d67bf9 100644
--- a/cabal.project
+++ b/cabal.project
@@ -4,7 +4,7 @@ packages:
          ./shake-bench
          ./ghcide
          ./hls-plugin-api
-         ./plugins/tactics
+         ./plugins/hls-tactics-plugin
          ./plugins/hls-class-plugin
          ./plugins/hls-eval-plugin
          ./plugins/hls-explicit-imports-plugin
diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
index 5a71ec2a15..6c0bf78ebe 100644
--- a/haskell-language-server.cabal
+++ b/haskell-language-server.cabal
@@ -8,11 +8,12 @@ description:
 
 homepage:           https://github.com/haskell/haskell-language-server#readme
 bug-reports:        https://github.com/haskell/haskell-language-server/issues
-author:             Alan Zimmerman
+author:             The Haskell IDE Team
 maintainer:         alan.zimm@gmail.com
-copyright:          Alan Zimmerman
+copyright:          The Haskell IDE Team
 license:            Apache-2.0
 license-file:       LICENSE
+category:           Development
 build-type:         Simple
 tested-with:        GHC == 8.6.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.1 || == 8.10.2 || == 8.10.3
 extra-source-files:
@@ -413,7 +414,7 @@ test-suite func-test
     , tasty-rerun
     , ghcide
 
-  hs-source-dirs:     test/functional plugins/tactics/src plugins/hls-eval-plugin/test plugins/hls-splice-plugin/src
+  hs-source-dirs:     test/functional plugins/hls-tactics-plugin/src plugins/hls-eval-plugin/test plugins/hls-splice-plugin/src
 
   main-is:            Main.hs
   other-modules:
diff --git a/hls-plugin-api/hls-plugin-api.cabal b/hls-plugin-api/hls-plugin-api.cabal
index 844be1ae55..abdc18a154 100644
--- a/hls-plugin-api/hls-plugin-api.cabal
+++ b/hls-plugin-api/hls-plugin-api.cabal
@@ -8,10 +8,10 @@ homepage:      https://github.com/haskell/haskell-language-server/hls-plugin-api
 bug-reports:   https://github.com/haskell/haskell-language-server/issues
 license:       Apache-2.0
 license-file:  LICENSE
-author:        Many,TBD when we release
-maintainer:    alan.zimm@gmail.com (for now)
-copyright:     Alan Zimmerman
-category:      Web
+author:        The Haskell IDE Team
+maintainer:    alan.zimm@gmail.com
+copyright:     The Haskell IDE Team
+category:      Development
 build-type:    Simple
 
 flag pedantic
diff --git a/nix/default.nix b/nix/default.nix
index 8ebbb50932..a570f8f6ba 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -27,7 +27,7 @@ let
             hls-hlint-plugin = gitignoreSource ../plugins/hls-hlint-plugin;
             hls-retrie-plugin = gitignoreSource ../plugins/hls-retrie-plugin;
             hls-splice-plugin = gitignoreSource ../plugins/hls-splice-plugin;
-            hls-tactics-plugin = gitignoreSource ../plugins/tactics;
+            hls-tactics-plugin = gitignoreSource ../plugins/hls-tactics-plugin;
           });
         in
         {
diff --git a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal
index 711d52a07a..02ed962af8 100644
--- a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal
+++ b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal
@@ -5,10 +5,10 @@ synopsis:      Hlint integration plugin with Haskell Language Server
 description:   Please see Haskell Language Server Readme (https://github.com/haskell/haskell-language-server#readme)
 license:       Apache-2.0
 license-file:  LICENSE
-author:        https://github.com/haskell/haskell-language-server/contributors
-maintainer:    https://github.com/haskell/haskell-language-server/contributors
-copyright:     Alan Zimmerman
-category:      Web
+author:        The Haskell IDE Team
+maintainer:    alan.zimm@gmail.com
+copyright:     The Haskell IDE Team
+category:      Development
 build-type:    Simple
 
 flag pedantic
diff --git a/plugins/tactics/hls-tactics-plugin.cabal b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal
similarity index 100%
rename from plugins/tactics/hls-tactics-plugin.cabal
rename to plugins/hls-tactics-plugin/hls-tactics-plugin.cabal
diff --git a/plugins/tactics/src/Ide/Plugin/Tactic.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic.hs
similarity index 100%
rename from plugins/tactics/src/Ide/Plugin/Tactic.hs
rename to plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic.hs
diff --git a/plugins/tactics/src/Ide/Plugin/Tactic/Auto.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Auto.hs
similarity index 100%
rename from plugins/tactics/src/Ide/Plugin/Tactic/Auto.hs
rename to plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Auto.hs
diff --git a/plugins/tactics/src/Ide/Plugin/Tactic/CodeGen.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/CodeGen.hs
similarity index 100%
rename from plugins/tactics/src/Ide/Plugin/Tactic/CodeGen.hs
rename to plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/CodeGen.hs
diff --git a/plugins/tactics/src/Ide/Plugin/Tactic/Context.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Context.hs
similarity index 100%
rename from plugins/tactics/src/Ide/Plugin/Tactic/Context.hs
rename to plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Context.hs
diff --git a/plugins/tactics/src/Ide/Plugin/Tactic/Debug.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Debug.hs
similarity index 100%
rename from plugins/tactics/src/Ide/Plugin/Tactic/Debug.hs
rename to plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Debug.hs
diff --git a/plugins/tactics/src/Ide/Plugin/Tactic/GHC.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/GHC.hs
similarity index 100%
rename from plugins/tactics/src/Ide/Plugin/Tactic/GHC.hs
rename to plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/GHC.hs
diff --git a/plugins/tactics/src/Ide/Plugin/Tactic/Judgements.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Judgements.hs
similarity index 100%
rename from plugins/tactics/src/Ide/Plugin/Tactic/Judgements.hs
rename to plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Judgements.hs
diff --git a/plugins/tactics/src/Ide/Plugin/Tactic/KnownStrategies.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/KnownStrategies.hs
similarity index 100%
rename from plugins/tactics/src/Ide/Plugin/Tactic/KnownStrategies.hs
rename to plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/KnownStrategies.hs
diff --git a/plugins/tactics/src/Ide/Plugin/Tactic/KnownStrategies/QuickCheck.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/KnownStrategies/QuickCheck.hs
similarity index 100%
rename from plugins/tactics/src/Ide/Plugin/Tactic/KnownStrategies/QuickCheck.hs
rename to plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/KnownStrategies/QuickCheck.hs
diff --git a/plugins/tactics/src/Ide/Plugin/Tactic/Machinery.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Machinery.hs
similarity index 100%
rename from plugins/tactics/src/Ide/Plugin/Tactic/Machinery.hs
rename to plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Machinery.hs
diff --git a/plugins/tactics/src/Ide/Plugin/Tactic/Naming.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Naming.hs
similarity index 100%
rename from plugins/tactics/src/Ide/Plugin/Tactic/Naming.hs
rename to plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Naming.hs
diff --git a/plugins/tactics/src/Ide/Plugin/Tactic/Range.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Range.hs
similarity index 100%
rename from plugins/tactics/src/Ide/Plugin/Tactic/Range.hs
rename to plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Range.hs
diff --git a/plugins/tactics/src/Ide/Plugin/Tactic/Tactics.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Tactics.hs
similarity index 100%
rename from plugins/tactics/src/Ide/Plugin/Tactic/Tactics.hs
rename to plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Tactics.hs
diff --git a/plugins/tactics/src/Ide/Plugin/Tactic/TestTypes.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/TestTypes.hs
similarity index 100%
rename from plugins/tactics/src/Ide/Plugin/Tactic/TestTypes.hs
rename to plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/TestTypes.hs
diff --git a/plugins/tactics/src/Ide/Plugin/Tactic/Types.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Types.hs
similarity index 100%
rename from plugins/tactics/src/Ide/Plugin/Tactic/Types.hs
rename to plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Types.hs
diff --git a/plugins/tactics/test/AutoTupleSpec.hs b/plugins/hls-tactics-plugin/test/AutoTupleSpec.hs
similarity index 100%
rename from plugins/tactics/test/AutoTupleSpec.hs
rename to plugins/hls-tactics-plugin/test/AutoTupleSpec.hs
diff --git a/plugins/tactics/test/Main.hs b/plugins/hls-tactics-plugin/test/Main.hs
similarity index 100%
rename from plugins/tactics/test/Main.hs
rename to plugins/hls-tactics-plugin/test/Main.hs
diff --git a/plugins/tactics/test/UnificationSpec.hs b/plugins/hls-tactics-plugin/test/UnificationSpec.hs
similarity index 100%
rename from plugins/tactics/test/UnificationSpec.hs
rename to plugins/hls-tactics-plugin/test/UnificationSpec.hs
diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml
index 392dce1a79..1c9dc94069 100644
--- a/stack-8.10.1.yaml
+++ b/stack-8.10.1.yaml
@@ -13,7 +13,7 @@ packages:
 - ./plugins/hls-hlint-plugin
 - ./plugins/hls-retrie-plugin
 - ./plugins/hls-splice-plugin
-- ./plugins/tactics
+- ./plugins/hls-tactics-plugin
 
 ghc-options:
   "$everything": -haddock
diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml
index 9ca762d148..e721a87553 100644
--- a/stack-8.10.2.yaml
+++ b/stack-8.10.2.yaml
@@ -13,7 +13,7 @@ packages:
   - ./plugins/hls-hlint-plugin
   - ./plugins/hls-retrie-plugin
   - ./plugins/hls-splice-plugin
-  - ./plugins/tactics
+  - ./plugins/hls-tactics-plugin
 
 ghc-options:
   "$everything": -haddock
diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml
index cd38185829..7efe1a0a87 100644
--- a/stack-8.10.3.yaml
+++ b/stack-8.10.3.yaml
@@ -13,7 +13,7 @@ packages:
   - ./plugins/hls-hlint-plugin
   - ./plugins/hls-retrie-plugin
   - ./plugins/hls-splice-plugin
-  - ./plugins/tactics
+  - ./plugins/hls-tactics-plugin
 
 ghc-options:
   "$everything": -haddock
diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml
index edfdcf6497..db0b8a13ff 100644
--- a/stack-8.6.4.yaml
+++ b/stack-8.6.4.yaml
@@ -14,7 +14,7 @@ packages:
   - ./plugins/hls-hlint-plugin
   - ./plugins/hls-retrie-plugin
   - ./plugins/hls-splice-plugin
-  - ./plugins/tactics
+  - ./plugins/hls-tactics-plugin
 
 ghc-options:
   "$everything": -haddock
diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
index 31fab4bf90..3410f9f787 100644
--- a/stack-8.6.5.yaml
+++ b/stack-8.6.5.yaml
@@ -13,7 +13,7 @@ packages:
   - ./plugins/hls-hlint-plugin
   - ./plugins/hls-retrie-plugin
   - ./plugins/hls-splice-plugin
-  - ./plugins/tactics
+  - ./plugins/hls-tactics-plugin
 
 ghc-options:
   "$everything": -haddock
diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml
index 5ad422fe8e..5b272d12ff 100644
--- a/stack-8.8.2.yaml
+++ b/stack-8.8.2.yaml
@@ -13,7 +13,7 @@ packages:
   - ./plugins/hls-hlint-plugin
   - ./plugins/hls-retrie-plugin
   - ./plugins/hls-splice-plugin
-  - ./plugins/tactics
+  - ./plugins/hls-tactics-plugin
 
 ghc-options:
   "$everything": -haddock
diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml
index c0a975de35..0ab9eca5bc 100644
--- a/stack-8.8.3.yaml
+++ b/stack-8.8.3.yaml
@@ -13,7 +13,7 @@ packages:
   - ./plugins/hls-hlint-plugin
   - ./plugins/hls-retrie-plugin
   - ./plugins/hls-splice-plugin
-  - ./plugins/tactics
+  - ./plugins/hls-tactics-plugin
 
 ghc-options:
   "$everything": -haddock
diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml
index 47e3dadd7f..1575f4d85a 100644
--- a/stack-8.8.4.yaml
+++ b/stack-8.8.4.yaml
@@ -13,7 +13,7 @@ packages:
   - ./plugins/hls-hlint-plugin
   - ./plugins/hls-retrie-plugin
   - ./plugins/hls-splice-plugin
-  - ./plugins/tactics
+  - ./plugins/hls-tactics-plugin
 
 ghc-options:
   "$everything": -haddock
diff --git a/stack.yaml b/stack.yaml
index a544abb25a..038d83f2a4 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -13,7 +13,7 @@ packages:
   - ./plugins/hls-hlint-plugin
   - ./plugins/hls-retrie-plugin
   - ./plugins/hls-splice-plugin
-  - ./plugins/tactics
+  - ./plugins/hls-tactics-plugin
 
 ghc-options:
   "$everything": -haddock