diff --git a/cross-chain/solana/solana-tbtc-anchor/.gitignore b/cross-chain/solana/.gitignore
similarity index 100%
rename from cross-chain/solana/solana-tbtc-anchor/.gitignore
rename to cross-chain/solana/.gitignore
diff --git a/cross-chain/solana/solana-tbtc-anchor/.prettierignore b/cross-chain/solana/.prettierignore
similarity index 100%
rename from cross-chain/solana/solana-tbtc-anchor/.prettierignore
rename to cross-chain/solana/.prettierignore
diff --git a/cross-chain/solana/solana-tbtc-anchor/Anchor.toml b/cross-chain/solana/Anchor.toml
similarity index 79%
rename from cross-chain/solana/solana-tbtc-anchor/Anchor.toml
rename to cross-chain/solana/Anchor.toml
index 94b4df4ae..415474b08 100644
--- a/cross-chain/solana/solana-tbtc-anchor/Anchor.toml
+++ b/cross-chain/solana/Anchor.toml
@@ -2,7 +2,7 @@
 seeds = false
 skip-lint = false
 [programs.localnet]
-solana_tbtc_anchor = "HksEtDgsXJV1BqcuhzbLRTmXp5gHgHJktieJCtQd3pG"
+tbtc = "HksEtDgsXJV1BqcuhzbLRTmXp5gHgHJktieJCtQd3pG"
 
 [registry]
 url = "https://api.apr.dev"
diff --git a/cross-chain/solana/solana-tbtc-anchor/Cargo.lock b/cross-chain/solana/Cargo.lock
similarity index 99%
rename from cross-chain/solana/solana-tbtc-anchor/Cargo.lock
rename to cross-chain/solana/Cargo.lock
index 2ec9ed067..199b830d0 100644
--- a/cross-chain/solana/solana-tbtc-anchor/Cargo.lock
+++ b/cross-chain/solana/Cargo.lock
@@ -1943,14 +1943,6 @@ dependencies = [
  "syn 2.0.25",
 ]
 
-[[package]]
-name = "solana-tbtc-anchor"
-version = "0.1.0"
-dependencies = [
- "anchor-lang",
- "anchor-spl",
-]
-
 [[package]]
 name = "solana-zk-token-sdk"
 version = "1.16.3"
@@ -2072,6 +2064,14 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "tbtc"
+version = "0.1.0"
+dependencies = [
+ "anchor-lang",
+ "anchor-spl",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.2.0"
diff --git a/cross-chain/solana/solana-tbtc-anchor/Cargo.toml b/cross-chain/solana/Cargo.toml
similarity index 100%
rename from cross-chain/solana/solana-tbtc-anchor/Cargo.toml
rename to cross-chain/solana/Cargo.toml
diff --git a/cross-chain/solana/solana-tbtc-anchor/migrations/deploy.ts b/cross-chain/solana/migrations/deploy.ts
similarity index 100%
rename from cross-chain/solana/solana-tbtc-anchor/migrations/deploy.ts
rename to cross-chain/solana/migrations/deploy.ts
diff --git a/cross-chain/solana/solana-tbtc-anchor/package.json b/cross-chain/solana/package.json
similarity index 100%
rename from cross-chain/solana/solana-tbtc-anchor/package.json
rename to cross-chain/solana/package.json
diff --git a/cross-chain/solana/solana-tbtc-anchor/programs/solana-tbtc-anchor/Cargo.toml b/cross-chain/solana/programs/tbtc/Cargo.toml
similarity index 83%
rename from cross-chain/solana/solana-tbtc-anchor/programs/solana-tbtc-anchor/Cargo.toml
rename to cross-chain/solana/programs/tbtc/Cargo.toml
index 4f6c212af..9aa4c8db8 100644
--- a/cross-chain/solana/solana-tbtc-anchor/programs/solana-tbtc-anchor/Cargo.toml
+++ b/cross-chain/solana/programs/tbtc/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-name = "solana-tbtc-anchor"
+name = "tbtc"
 version = "0.1.0"
 description = "Created with Anchor"
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]
-name = "solana_tbtc_anchor"
+name = "tbtc"
 
 [features]
 no-entrypoint = []
diff --git a/cross-chain/solana/solana-tbtc-anchor/programs/solana-tbtc-anchor/Xargo.toml b/cross-chain/solana/programs/tbtc/Xargo.toml
similarity index 100%
rename from cross-chain/solana/solana-tbtc-anchor/programs/solana-tbtc-anchor/Xargo.toml
rename to cross-chain/solana/programs/tbtc/Xargo.toml
diff --git a/cross-chain/solana/solana-tbtc-anchor/programs/solana-tbtc-anchor/src/lib.rs b/cross-chain/solana/programs/tbtc/src/lib.rs
similarity index 99%
rename from cross-chain/solana/solana-tbtc-anchor/programs/solana-tbtc-anchor/src/lib.rs
rename to cross-chain/solana/programs/tbtc/src/lib.rs
index 288355645..9200f3d83 100644
--- a/cross-chain/solana/solana-tbtc-anchor/programs/solana-tbtc-anchor/src/lib.rs
+++ b/cross-chain/solana/programs/tbtc/src/lib.rs
@@ -8,7 +8,7 @@ use anchor_spl::{
 declare_id!("HksEtDgsXJV1BqcuhzbLRTmXp5gHgHJktieJCtQd3pG");
 
 #[program]
-pub mod solana_tbtc_anchor {
+pub mod tbtc {
     use super::*;
     
     pub fn initialize(ctx: Context<Initialize>) -> Result<()> {
diff --git a/cross-chain/solana/solana-tbtc-anchor/tests/solana-tbtc-anchor.ts b/cross-chain/solana/tests/tbtc.ts
similarity index 95%
rename from cross-chain/solana/solana-tbtc-anchor/tests/solana-tbtc-anchor.ts
rename to cross-chain/solana/tests/tbtc.ts
index a0a8ea0d5..53dff9b49 100644
--- a/cross-chain/solana/solana-tbtc-anchor/tests/solana-tbtc-anchor.ts
+++ b/cross-chain/solana/tests/tbtc.ts
@@ -2,7 +2,7 @@ import * as anchor from "@coral-xyz/anchor";
 import { Program, AnchorError } from "@coral-xyz/anchor";
 import * as spl from "@solana/spl-token";
 import * as web3 from '@solana/web3.js';
-import { SolanaTbtcAnchor } from "../target/types/solana_tbtc_anchor";
+import { Tbtc } from "../target/types/tbtc";
 import { expect } from 'chai';
 
 function maybeAuthorityAnd(
@@ -13,7 +13,7 @@ function maybeAuthorityAnd(
 }
 
 async function setup(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
   authority
 ) {
@@ -31,7 +31,7 @@ async function setup(
 }
 
 async function checkState(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
   expectedAuthority,
   expectedMinters,
@@ -52,7 +52,7 @@ async function checkState(
 }
 
 async function checkPaused(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
   paused: boolean
 ) {
@@ -61,7 +61,7 @@ async function checkPaused(
 }
 
 function getTokenPDA(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
 ): [anchor.web3.PublicKey, number] {
   return web3.PublicKey.findProgramAddressSync(
@@ -74,7 +74,7 @@ function getTokenPDA(
 }
 
 function getMinterPDA(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
   minter
 ): [anchor.web3.PublicKey, number] {
@@ -89,7 +89,7 @@ function getMinterPDA(
 }
 
 async function addMinter(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
   authority,
   minter,
@@ -111,7 +111,7 @@ async function addMinter(
 }
 
 async function checkMinter(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
   minter
 ) {
@@ -123,7 +123,7 @@ async function checkMinter(
 }
 
 async function removeMinter(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
   authority,
   minter,
@@ -141,7 +141,7 @@ async function removeMinter(
 }
 
 function getGuardianPDA(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
   guardian
 ): [anchor.web3.PublicKey, number] {
@@ -156,7 +156,7 @@ function getGuardianPDA(
 }
 
 async function addGuardian(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
   authority,
   guardian,
@@ -178,7 +178,7 @@ async function addGuardian(
 }
 
 async function checkGuardian(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
   guardian
 ) {
@@ -190,7 +190,7 @@ async function checkGuardian(
 }
 
 async function removeGuardian(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
   authority,
   guardian,
@@ -208,7 +208,7 @@ async function removeGuardian(
 }
 
 async function pause(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
   guardian
 ) {
@@ -225,7 +225,7 @@ async function pause(
 }
 
 async function unpause(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
   authority
 ) {
@@ -240,7 +240,7 @@ async function unpause(
 }
 
 async function setupMint(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
   authority,
   recipient,
@@ -265,7 +265,7 @@ async function setupMint(
 }
 
 async function mint(
-  program: Program<SolanaTbtcAnchor>,
+  program: Program<Tbtc>,
   tbtc,
   minter,
   minterInfoPDA,
@@ -292,11 +292,11 @@ async function mint(
     .rpc();
 }
 
-describe("solana-tbtc-anchor", () => {
+describe("tbtc", () => {
   // Configure the client to use the local cluster.
   anchor.setProvider(anchor.AnchorProvider.env());
 
-  const program = anchor.workspace.SolanaTbtcAnchor as Program<SolanaTbtcAnchor>;
+  const program = anchor.workspace.Tbtc as Program<Tbtc>;
 
   
   const authority = (program.provider as anchor.AnchorProvider).wallet;
diff --git a/cross-chain/solana/solana-tbtc-anchor/tsconfig.json b/cross-chain/solana/tsconfig.json
similarity index 100%
rename from cross-chain/solana/solana-tbtc-anchor/tsconfig.json
rename to cross-chain/solana/tsconfig.json
diff --git a/package.json b/package.json
index 69cf8e6d2..854ac1535 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,6 @@
     "prettier-plugin-solidity": "^1.0.0-beta.14"
   },
   "workspaces": [
-    "./cross-chain/solana/*"
+    "./cross-chain/solana"
   ]
 }
diff --git a/yarn.lock b/yarn.lock
index cd01785e0..1f6b9cfda 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2091,9 +2091,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"solana-tbtc-anchor-924226@workspace:cross-chain/solana/solana-tbtc-anchor":
+"solana-d8f61a@workspace:cross-chain/solana":
   version: 0.0.0-use.local
-  resolution: "solana-tbtc-anchor-924226@workspace:cross-chain/solana/solana-tbtc-anchor"
+  resolution: "solana-d8f61a@workspace:cross-chain/solana"
   dependencies:
     "@coral-xyz/anchor": ^0.28.0
     "@solana/spl-token": ^0.3.8