diff --git a/Abacus.Blockchain.Observables/Blockchain.cs b/Abacus.Blockchain.Observables/Blockchain.cs
index 9cf6359..e062115 100644
--- a/Abacus.Blockchain.Observables/Blockchain.cs
+++ b/Abacus.Blockchain.Observables/Blockchain.cs
@@ -59,13 +59,13 @@ public IDisposable Subscribe(IObserver<IBlock<ITransaction<TId, TData>>> observe
 }
 
 // This interface represents the contract for a service that can provide observable queries over blockchain entities.
-public interface IBlockchainQueryService<T> where T : IBitcoin {
-    IQbservable<T> AsQueryable();
+public interface IBlockchainQueryService<TId, TData> where TId : IBitcoin<TId, TData>{
+    IQbservable<TData> AsQueryable();
 }
 
 // An example implementation for Bitcoin. This would need to be fleshed out with actual logic for observing blockchain data.
-public class BitcoinQueryService : IBlockchainQueryService<BTC> {
-    public IQbservable<BTC> AsQueryable() {
+public class BitcoinQueryService<TId, TData> : IBlockchainQueryService<BTC<TId, TData>> {
+    public IQbservable<BTC<TId, TData>> AsQueryable() {
         // Here you would return an IQbservable that represents your live, queryable blockchain data.
         // This is a conceptual placeholder.
         throw new NotImplementedException();
@@ -96,7 +96,7 @@ public interface ITransaction<TId, TData>
     TId GetId();
     TId SetId(TId input);
     TId SetData(TData input);
-    TData GetData(TId ());
+    TData GetData();
 }
 
 public class Blockchain<T>
diff --git a/Abacus.Cryptography/Abacus.Cryptography.csproj b/Abacus.Cryptography/Bonsai.Cryptography.csproj
similarity index 100%
rename from Abacus.Cryptography/Abacus.Cryptography.csproj
rename to Abacus.Cryptography/Bonsai.Cryptography.csproj
diff --git a/Abacus.Extensions/Abacus.Extensions.csproj b/Abacus.Extensions/Bonsai.Extensions.csproj
similarity index 100%
rename from Abacus.Extensions/Abacus.Extensions.csproj
rename to Abacus.Extensions/Bonsai.Extensions.csproj
diff --git a/Bonsai.sln b/Bonsai.sln
index 236dc68..27ad4e1 100644
--- a/Bonsai.sln
+++ b/Bonsai.sln
@@ -7,9 +7,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bonsai.CLI", "Abacus\Bonsai
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bonsai.Observables", "Abacus.Blockchain.Observables\Bonsai.Observables.csproj", "{6CFEBBD0-B9D9-4257-A636-3DE2DE30FDB6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abacus.Extensions", "Abacus.Extensions\Abacus.Extensions.csproj", "{3E5E4784-AA13-4AA4-AD93-8375987ED2B1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bonsai.Extensions", "Abacus.Extensions\Bonsai.Extensions.csproj", "{3E5E4784-AA13-4AA4-AD93-8375987ED2B1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abacus.Cryptography", "Abacus.Cryptography\Abacus.Cryptography.csproj", "{981AD38F-8129-41E3-82CA-8EC85CBBD72A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bonsai.Cryptography", "Abacus.Cryptography\Bonsai.Cryptography.csproj", "{981AD38F-8129-41E3-82CA-8EC85CBBD72A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MauiBlazorNode", "MauiBlazorNode\MauiBlazorNode.csproj", "{73EB7EE4-15D6-4E7D-8E14-75231CC0331E}"
 EndProject