diff --git a/fuzzing/src/build_commitment_fuzz.rs b/fuzzing/src/build_commitment_fuzz.rs
index e35125445..d36a88430 100644
--- a/fuzzing/src/build_commitment_fuzz.rs
+++ b/fuzzing/src/build_commitment_fuzz.rs
@@ -1,5 +1,5 @@
 use afl;
-use da_primitives::asdr::AppExtrinsic;
+use avail_core::AppExtrinsic;
 use hex_literal::hex;
 
 fn main() {
diff --git a/fuzzing/src/build_proof_fuzz.rs b/fuzzing/src/build_proof_fuzz.rs
index 36e7e042a..d00c4e060 100644
--- a/fuzzing/src/build_proof_fuzz.rs
+++ b/fuzzing/src/build_proof_fuzz.rs
@@ -1,5 +1,5 @@
 use afl;
-use da_primitives::asdr::AppExtrinsic;
+use avail_core::AppExtrinsic;
 use hex_literal::hex;
 
 fn main() {
diff --git a/pallets/mocked_runtime/src/lib.rs b/pallets/mocked_runtime/src/lib.rs
index a66e8411d..2a7344fca 100644
--- a/pallets/mocked_runtime/src/lib.rs
+++ b/pallets/mocked_runtime/src/lib.rs
@@ -1,4 +1,4 @@
-use da_primitives::{BlockLengthColumns, BlockLengthRows, NORMAL_DISPATCH_RATIO};
+use avail_core::{BlockLengthColumns, BlockLengthRows, NORMAL_DISPATCH_RATIO};
 use frame_support::{
 	construct_runtime, parameter_types,
 	traits::Randomness,
@@ -25,7 +25,7 @@ pub type AccountId = u64;
 pub type Balance = u128;
 pub type BlockNumber = u32;
 pub type Moment = u64;
-pub type Header = da_primitives::Header<BlockNumber, BlakeTwo256>;
+pub type Header = avail_core::header::Header<BlockNumber, BlakeTwo256>;
 pub type Signature = sp_runtime::testing::sr25519::Signature;
 pub type TestXt = test_xt::TestXt<RuntimeCall, SignedExtra>;
 pub type UncheckedExtrinsic = TestXt;
@@ -140,7 +140,7 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type Hash = sp_core::H256;
 	type Hashing = BlakeTwo256;
-	type Header = da_primitives::Header<Self::BlockNumber, Self::Hashing>;
+	type Header = avail_core::header::Header<Self::BlockNumber, Self::Hashing>;
 	type HeaderExtensionBuilder = frame_system::header_builder::da::HeaderExtensionBuilder<Runtime>;
 	type Index = u64;
 	type Lookup = IdentityLookup<u64>;
diff --git a/pallets/mocked_runtime/src/test_xt.rs b/pallets/mocked_runtime/src/test_xt.rs
index 75e314585..d80c9daf4 100644
--- a/pallets/mocked_runtime/src/test_xt.rs
+++ b/pallets/mocked_runtime/src/test_xt.rs
@@ -1,5 +1,5 @@
 use codec::{Codec, Decode, Encode};
-use da_primitives::asdr::{AppId, GetAppId};
+use avail_core::{AppId, traits::GetAppId};
 use derive_more::From;
 use frame_support::{dispatch, traits::ExtrinsicCall};
 use scale_info::TypeInfo;
diff --git a/pallets/system/benches/bench.rs b/pallets/system/benches/bench.rs
index b317d9652..3aa7f80a8 100644
--- a/pallets/system/benches/bench.rs
+++ b/pallets/system/benches/bench.rs
@@ -15,8 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use avail_core::header::Header as DaHeader;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use da_primitives::Header as DaHeader;
 use frame_support::{
 	traits::{ConstU32, ConstU64},
 	weights::Weight,
diff --git a/pallets/system/src/data_root_builder.rs b/pallets/system/src/data_root_builder.rs
index b597aad94..5d8f2ce9e 100644
--- a/pallets/system/src/data_root_builder.rs
+++ b/pallets/system/src/data_root_builder.rs
@@ -1,5 +1,5 @@
 use codec::Decode;
-use da_primitives::asdr::AppExtrinsic;
+use avail_core::AppExtrinsic;
 use frame_support::traits::ExtrinsicCall;
 use sp_core::H256;
 use sp_runtime::traits::Extrinsic;
@@ -119,7 +119,7 @@ impl<F: DataRootFilter> DataRootBuilder<F> for F {}
 
 #[cfg(all(test, feature = "force-rs-merkle"))]
 mod test {
-	use da_primitives::asdr::AppId;
+	use avail_core::AppId;
 	use hex_literal::hex;
 	use rs_merkle::{algorithms::Sha256, Hasher, MerkleTree};
 	use test_case::test_case;
diff --git a/pallets/system/src/submitted_data.rs b/pallets/system/src/submitted_data.rs
index 0e2a35a1d..3af159b64 100644
--- a/pallets/system/src/submitted_data.rs
+++ b/pallets/system/src/submitted_data.rs
@@ -239,7 +239,7 @@ where
 
 #[cfg(all(test, feature = "force-rs-merkle"))]
 mod test {
-	use da_primitives::asdr::AppId;
+	use avail_core::AppId;
 	use hex_literal::hex;
 	use rs_merkle::{algorithms::Sha256, Hasher, MerkleTree};
 	use test_case::test_case;