diff --git a/.idea/acrate.iml b/.idea/acrate.iml
index 32d223d..48f40e0 100644
--- a/.idea/acrate.iml
+++ b/.idea/acrate.iml
@@ -3,13 +3,13 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/acrate-core/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/acrate-hostmeta/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/acrate-hostmeta/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/acrate-inbox/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/acrate-nodeinfo/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/acrate-nodeinfo/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/acrate-webfinger/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/acrate_database/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index 4495f93..6447d3b 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$/acrate-core/migrations/2024-11-14-031744_meta/up.sql" dialect="GenericSQL" />
+    <file url="file://$PROJECT_DIR$/acrate_database/migrations/2024-11-14-031744_meta/up.sql" dialect="GenericSQL" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Cargo.toml b/Cargo.toml
index 357abb7..96cfab2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,3 @@
 [workspace]
 resolver = "2"
-members = ["acrate-core", "acrate-hostmeta", "acrate-inbox", "acrate-nodeinfo", "acrate-webfinger"]
+members = ["acrate_database", "acrate-hostmeta", "acrate-inbox", "acrate-nodeinfo", "acrate-webfinger"]
diff --git a/acrate-webfinger/Cargo.toml b/acrate-webfinger/Cargo.toml
index cfd73d0..c6983f1 100644
--- a/acrate-webfinger/Cargo.toml
+++ b/acrate-webfinger/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-acrate-core = { path = "../acrate-core" }
+acrate_database = { path = "../acrate_database" }
 acrate-hostmeta = { path = "../acrate-hostmeta" }
 anyhow = "1.0.93"
 axum = { version = "0.7.7", features = ["macros"] }
diff --git a/acrate-webfinger/src/route.rs b/acrate-webfinger/src/route.rs
index 3c51847..bda54ad 100644
--- a/acrate-webfinger/src/route.rs
+++ b/acrate-webfinger/src/route.rs
@@ -3,9 +3,9 @@ use axum::Extension;
 use axum::http::{HeaderMap, Response, StatusCode};
 use axum_extra::extract::Query;
 use serde::Deserialize;
-use acrate_core::diesel::GroupedBy;
-use acrate_core::diesel_async::{AsyncConnection, AsyncPgConnection};
-use acrate_core::meta::{MetaAlias, MetaLink, MetaLinkProperty, MetaLinkTitle, MetaProperty, MetaSubject};
+use acrate_database::diesel::GroupedBy;
+use acrate_database::diesel_async::{AsyncConnection, AsyncPgConnection};
+use acrate_database::meta::{MetaAlias, MetaLink, MetaLinkProperty, MetaLinkTitle, MetaProperty, MetaSubject};
 use acrate_hostmeta::jrd::ResourceDescriptorLinkJRD;
 use acrate_hostmeta::xrd::{ResourceDescriptorLinkXRD, ResourceDescriptorPropertyXRD, ResourceDescriptorTitleXRD};
 use crate::config;
diff --git a/acrate-core/Cargo.toml b/acrate_database/Cargo.toml
similarity index 85%
rename from acrate-core/Cargo.toml
rename to acrate_database/Cargo.toml
index d5b738a..89234c4 100644
--- a/acrate-core/Cargo.toml
+++ b/acrate_database/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-name = "acrate-core"
-version = "0.1.0"
+name = "acrate_database"
+version = "0.2.0"
 edition = "2021"
 
 [dependencies]
diff --git a/acrate-core/diesel.toml b/acrate_database/diesel.toml
similarity index 100%
rename from acrate-core/diesel.toml
rename to acrate_database/diesel.toml
diff --git a/acrate-core/migrations/0000-00-00-000000_diesel_initial_setup/down.sql b/acrate_database/migrations/0000-00-00-000000_diesel_initial_setup/down.sql
similarity index 100%
rename from acrate-core/migrations/0000-00-00-000000_diesel_initial_setup/down.sql
rename to acrate_database/migrations/0000-00-00-000000_diesel_initial_setup/down.sql
diff --git a/acrate-core/migrations/0000-00-00-000000_diesel_initial_setup/up.sql b/acrate_database/migrations/0000-00-00-000000_diesel_initial_setup/up.sql
similarity index 100%
rename from acrate-core/migrations/0000-00-00-000000_diesel_initial_setup/up.sql
rename to acrate_database/migrations/0000-00-00-000000_diesel_initial_setup/up.sql
diff --git a/acrate-core/migrations/2024-11-14-031744_meta/down.sql b/acrate_database/migrations/2024-11-14-031744_meta/down.sql
similarity index 100%
rename from acrate-core/migrations/2024-11-14-031744_meta/down.sql
rename to acrate_database/migrations/2024-11-14-031744_meta/down.sql
diff --git a/acrate-core/migrations/2024-11-14-031744_meta/up.sql b/acrate_database/migrations/2024-11-14-031744_meta/up.sql
similarity index 100%
rename from acrate-core/migrations/2024-11-14-031744_meta/up.sql
rename to acrate_database/migrations/2024-11-14-031744_meta/up.sql
diff --git a/acrate-core/src/lib.rs b/acrate_database/src/lib.rs
similarity index 100%
rename from acrate-core/src/lib.rs
rename to acrate_database/src/lib.rs
diff --git a/acrate-core/src/meta.rs b/acrate_database/src/meta.rs
similarity index 100%
rename from acrate-core/src/meta.rs
rename to acrate_database/src/meta.rs
diff --git a/acrate-core/src/schema.rs b/acrate_database/src/schema.rs
similarity index 100%
rename from acrate-core/src/schema.rs
rename to acrate_database/src/schema.rs