diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8f09369..4b59a2a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,16 +1,16 @@
 version: 2
 updates:
   - package-ecosystem: "cargo"
-    directory: "/tap_aggregator"
+    directory: "/crates/aggregator"
     schedule:
       interval: "daily"
 
   - package-ecosystem: "cargo"
-    directory: "/tap_core"
+    directory: "/crates/core"
     schedule:
       interval: "daily"
 
   - package-ecosystem: "cargo"
-    directory: "/tap_integration_tests"
+    directory: "/crates/integration_tests"
     schedule:
-      interval: "daily"
\ No newline at end of file
+      interval: "daily"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 708833c..fa49a7e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     outputs:
-      tap_aggregator: ${{ steps.release-please.outputs['tap_aggregator--tag_name'] }}
+      graph_tally_aggregator: ${{ steps.release-please.outputs['crates/aggregator--tag_name'] }}
     steps:
       - name: Release please
         id: release-please
@@ -36,7 +36,7 @@ jobs:
     if: always() && (needs.release-please.result == 'success' || needs.release-please.result == 'skipped')
     strategy:
       matrix:
-        target: [tap_aggregator]
+        target: [graph_tally_aggregator]
     permissions:
       packages: write
     steps:
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 2b2bc72..a6bab38 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,9 +1,9 @@
 {
   ".": "0.0.0",
-  "tap_aggregator": "0.6.4",
-  "tap_core": "6.0.3",
-  "tap_integration_tests": "0.1.27",
-  "tap_eip712_message": "0.2.3",
-  "tap_graph": "0.3.5",
-  "tap_receipt": "1.1.4"
+  "crates/aggregator": "0.6.4",
+  "crates/core": "6.0.3",
+  "crates/integration_tests": "0.1.27",
+  "crates/eip712_message": "0.2.3",
+  "crates/graph": "0.3.5",
+  "crates/receipt": "1.1.4"
 }
diff --git a/Dockerfile.tap_aggregator b/Dockerfile.graph_tally_aggregator
similarity index 68%
rename from Dockerfile.tap_aggregator
rename to Dockerfile.graph_tally_aggregator
index 0f233a0..e1f74fc 100644
--- a/Dockerfile.tap_aggregator
+++ b/Dockerfile.graph_tally_aggregator
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 COPY . .
 
-RUN cargo build --release --bin tap_aggregator
+RUN cargo build --release --bin graph_tally_aggregator
 
 ########################################################################################
 
@@ -17,6 +17,6 @@ FROM debian:bookworm-slim
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates libsasl2-dev openssl \
     && rm -rf /var/lib/apt/lists/*
-COPY --from=build /root/target/release/tap_aggregator /usr/local/bin/tap_aggregator
+COPY --from=build /root/target/release/graph_tally_aggregator /usr/local/bin/graph_tally_aggregator
 
-ENTRYPOINT [ "/usr/local/bin/tap_aggregator" ]
+ENTRYPOINT [ "/usr/local/bin/graph_tally_aggregator" ]
diff --git a/release-please-config.json b/release-please-config.json
index 7e02b5c..9e6738b 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -3,11 +3,11 @@
   "release-type": "rust",
   "draft": false,
   "packages": {
-    "tap_core": {},
-    "tap_graph": {},
-    "tap_eip712_message": {},
-    "tap_receipt": {},
-    "tap_aggregator": {
+    "crates/core": {},
+    "crates/graph": {},
+    "crates/eip712_message": {},
+    "crates/receipt": {},
+    "crates/aggregator": {
       "bump-minor-pre-major": true,
       "bump-patch-for-minor-pre-major": true,
       "prerelease": true