diff --git a/src/core/contract_address/casm_contract_address.rs b/src/core/contract_address/casm_contract_address.rs
index 10de1d702..34123232e 100644
--- a/src/core/contract_address/casm_contract_address.rs
+++ b/src/core/contract_address/casm_contract_address.rs
@@ -1,6 +1,6 @@
 use crate::core::errors::contract_address_errors::ContractAddressError;
 use crate::services::api::contract_classes::deprecated_contract_class::EntryPointType;
-use cairo_lang_starknet::casm_contract_class::{CasmContractClass, CasmContractEntryPoint};
+use cairo_lang_starknet_classes::casm_contract_class::{CasmContractClass, CasmContractEntryPoint};
 use cairo_vm::Felt252;
 use starknet_crypto::{poseidon_hash_many, FieldElement};
 
diff --git a/src/core/contract_address/deprecated_contract_address.rs b/src/core/contract_address/deprecated_contract_address.rs
index 0ffb66a21..0c92dfe67 100644
--- a/src/core/contract_address/deprecated_contract_address.rs
+++ b/src/core/contract_address/deprecated_contract_address.rs
@@ -326,11 +326,7 @@ pub fn compute_deprecated_class_hash(
 
     for builtin_name in contract_class.program().iter_builtins() {
         builtin_list_vec.push(Felt252::from_bytes_be_slice(
-            builtin_name
-                .name()
-                .strip_suffix("_builtin")
-                .ok_or(ContractAddressError::BuiltinSuffix)?
-                .as_bytes(),
+            builtin_name.to_str().as_bytes(),
         ));
     }
 
diff --git a/src/core/contract_address/sierra_contract_address.rs b/src/core/contract_address/sierra_contract_address.rs
index e6e7f9b66..04ad0115a 100644
--- a/src/core/contract_address/sierra_contract_address.rs
+++ b/src/core/contract_address/sierra_contract_address.rs
@@ -1,7 +1,7 @@
 use crate::{core::errors::contract_address_errors::ContractAddressError, EntryPointType};
-use cairo_lang_starknet::{
-    contract::starknet_keccak,
+use cairo_lang_starknet_classes::{
     contract_class::{ContractClass as SierraContractClass, ContractEntryPoint},
+    keccak::starknet_keccak,
 };
 use cairo_vm::Felt252;
 use serde_json::ser::Formatter;