diff --git a/OCanren-ppx.opam b/OCanren-ppx.opam
index 4bcd0c6d..c4742697 100644
--- a/OCanren-ppx.opam
+++ b/OCanren-ppx.opam
@@ -28,15 +28,14 @@ authors: [
   "Dmitrii Kosarev https://github.com/Kakadu"
   "JetBrains Research https://research.jetbrains.org"
 ]
-license: "LGPL-2.1"
-homepage: "https://github.com/JetBrains-Research/OCanren"
-bug-reports: "https://github.com/JetBrains-Research/OCanren/issues"
+license: "LGPL-2.1-only"
+homepage: "https://github.com/PLTools/OCanren"
+bug-reports: "https://github.com/PLTools/OCanren/issues"
 depends: [
   "dune" {>= "2.9"}
   "ocaml" {>= "4.10"}
   "dune-configurator"
   "ppxlib" {>= "0.26.0" & <= "0.28.0"}
-  "base"
   "ppx_inline_test"
   "ppx_expect"
   "odoc" {with-doc}
@@ -57,4 +56,4 @@ build: [
   ]
   ["dune" "install" "-p" name "--create-install-files" name]
 ]
-dev-repo: "git+https://github.com/JetBrains-Research/OCanren.git"
+dev-repo: "git+https://github.com/PLTools/OCanren.git"
diff --git a/OCanren.opam b/OCanren.opam
index b74da02f..74bb0832 100644
--- a/OCanren.opam
+++ b/OCanren.opam
@@ -19,9 +19,9 @@ authors: [
   "Evgenii Moiseenko https://github.com/eupp"
   "JetBrains Research https://research.jetbrains.org"
 ]
-license: "LGPL-2.1"
-homepage: "https://github.com/JetBrains-Research/OCanren"
-bug-reports: "https://github.com/JetBrains-Research/OCanren/issues"
+license: "LGPL-2.1-only"
+homepage: "https://github.com/PLTools/OCanren"
+bug-reports: "https://github.com/PLTools/OCanren/issues"
 depends: [
   "dune" {>= "2.9"}
   "ocaml" {>= "4.10"}
@@ -52,4 +52,4 @@ build: [
   ]
   ["dune" "install" "-p" name "--create-install-files" name]
 ]
-dev-repo: "git+https://github.com/JetBrains-Research/OCanren.git"
+dev-repo: "git+https://github.com/PLTools/OCanren.git"
diff --git a/dune-project b/dune-project
index 2c15cc0b..a35ef095 100644
--- a/dune-project
+++ b/dune-project
@@ -4,10 +4,10 @@
 
 (generate_opam_files true)
 
-(license LGPL-2.1)
+(license LGPL-2.1-only)
 
 (source
- (github JetBrains-Research/OCanren))
+ (github PLTools/OCanren))
 
 (name OCanren)
 
@@ -41,7 +41,7 @@
   "Petr Lozov https://github.com/Lozov-Petr"
   "Evgenii Moiseenko https://github.com/eupp"
   "JetBrains Research https://research.jetbrains.org")
- (bug_reports "https://github.com/JetBrains-Research/OCanren/issues")
+ (bug_reports "https://github.com/PLTools/OCanren/issues")
  (maintainers "Dmitrii Kosarev Kakadu@pm.me"))
 
 (package
@@ -59,11 +59,10 @@
    (and
     (>= 0.26.0)
     (<= 0.28.0)))
-  base ; TODO: get rid of 'base'
   ppx_inline_test
   ppx_expect)
  (authors
   "Dmitrii Kosarev https://github.com/Kakadu"
   "JetBrains Research https://research.jetbrains.org")
- (bug_reports "https://github.com/JetBrains-Research/OCanren/issues")
+ (bug_reports "https://github.com/PLTools/OCanren/issues")
  (maintainers "Dmitrii Kosarev Kakadu@pm.me"))