2 files changed, 10 insertions, 10 deletions

diff --git a/rust/src/database/kvs.rs b/rust/src/database/kvs.rs
index 4b77bbdb..43cf17eb 100644
--- a/rust/src/database/kvs.rs
+++ b/rust/src/database/kvs.rs
@@ -1,6 +1,6 @@
 use crate::data_buffer::DataBuffer;
 use crate::rc::{Array, Ref, RefCountable};
-use crate::string::{BnStrCompatible, BnString};
+use crate::string::{AsCStr, BnString};
 use binaryninjacore_sys::{
     BNBeginKeyValueStoreNamespace, BNEndKeyValueStoreNamespace, BNFreeKeyValueStore,
     BNGetKeyValueStoreBuffer, BNGetKeyValueStoreDataSize, BNGetKeyValueStoreKeys,
@@ -42,16 +42,16 @@ impl KeyValueStore {
     }
 
     /// Get the value for a single key
-    pub fn value<S: BnStrCompatible>(&self, key: S) -> Option<DataBuffer> {
-        let key_raw = key.into_bytes_with_nul();
+    pub fn value<S: AsCStr>(&self, key: S) -> Option<DataBuffer> {
+        let key_raw = key.to_cstr();
         let key_ptr = key_raw.as_ref().as_ptr() as *const c_char;
         let result = unsafe { BNGetKeyValueStoreBuffer(self.handle.as_ptr(), key_ptr) };
         NonNull::new(result).map(|_| DataBuffer::from_raw(result))
     }
 
     /// Set the value for a single key
-    pub fn set_value<S: BnStrCompatible>(&self, key: S, value: &DataBuffer) -> bool {
-        let key_raw = key.into_bytes_with_nul();
+    pub fn set_value<S: AsCStr>(&self, key: S, value: &DataBuffer) -> bool {
+        let key_raw = key.to_cstr();
         let key_ptr = key_raw.as_ref().as_ptr() as *const c_char;
         unsafe { BNSetKeyValueStoreBuffer(self.handle.as_ptr(), key_ptr, value.as_raw()) }
     }
@@ -64,8 +64,8 @@ impl KeyValueStore {
     }
 
     /// Begin storing new keys into a namespace
-    pub fn begin_namespace<S: BnStrCompatible>(&self, name: S) {
-        let name_raw = name.into_bytes_with_nul();
+    pub fn begin_namespace<S: AsCStr>(&self, name: S) {
+        let name_raw = name.to_cstr();
         let name_ptr = name_raw.as_ref().as_ptr() as *const c_char;
         unsafe { BNBeginKeyValueStoreNamespace(self.handle.as_ptr(), name_ptr) }
     }
diff --git a/rust/src/database/snapshot.rs b/rust/src/database/snapshot.rs
index 3768138c..7d7e39d1 100644
--- a/rust/src/database/snapshot.rs
+++ b/rust/src/database/snapshot.rs
@@ -4,7 +4,7 @@ use crate::database::undo::UndoEntry;
 use crate::database::Database;
 use crate::progress::ProgressCallback;
 use crate::rc::{Array, CoreArrayProvider, CoreArrayProviderInner, Guard, Ref, RefCountable};
-use crate::string::{BnStrCompatible, BnString};
+use crate::string::{AsCStr, BnString};
 use binaryninjacore_sys::{
     BNCollaborationFreeSnapshotIdList, BNFreeSnapshot, BNFreeSnapshotList, BNGetSnapshotChildren,
     BNGetSnapshotDatabase, BNGetSnapshotFileContents, BNGetSnapshotFileContentsHash,
@@ -50,8 +50,8 @@ impl Snapshot {
     }
 
     /// Set the displayed snapshot name
-    pub fn set_name<S: BnStrCompatible>(&self, value: S) {
-        let value_raw = value.into_bytes_with_nul();
+    pub fn set_name<S: AsCStr>(&self, value: S) {
+        let value_raw = value.to_cstr();
         let value_ptr = value_raw.as_ref().as_ptr() as *const c_char;
         unsafe { BNSetSnapshotName(self.handle.as_ptr(), value_ptr) }
     }