diff --git a/src/CoreApi/IFilesStoreApiObjectResponse.cs b/src/CoreApi/IFilesStoreApiObjectResponse.cs
index f4dae4d2..862ce706 100644
--- a/src/CoreApi/IFilesStoreApiObjectResponse.cs
+++ b/src/CoreApi/IFilesStoreApiObjectResponse.cs
@@ -17,11 +17,6 @@ public interface IFilesStoreApiObjectResponse
         /// </summary>
         public string FilePath { get; set; }
 
-        /// <summary>
-        /// The key to the Filestore.
-        /// </summary>
-        public IFilesStoreKey Key { get; set; }
-
         /// <summary>
         /// The response offset.
         /// </summary>
@@ -47,7 +42,7 @@ public interface IFilesStoreKey
         /// Key value.
         /// </summary>
         [JsonProperty("/")]
-        public string Value { get; set; }
+        public string _ { get; set; }
     }
 
     /// <summary>
diff --git a/src/CoreApi/IKeyApi.cs b/src/CoreApi/IKeyApi.cs
index f4a08262..0d254139 100644
--- a/src/CoreApi/IKeyApi.cs
+++ b/src/CoreApi/IKeyApi.cs
@@ -34,7 +34,7 @@ public interface IKeyApi
         ///   A task that represents the asynchronous operation. The task's result is
         ///   the key that was created.
         /// </returns>
-        Task<IFilesStoreKey> CreateAsync(
+        Task<IKey> CreateAsync(
             string name,
             string keyType,
             int size,
@@ -50,7 +50,7 @@ Task<IFilesStoreKey> CreateAsync(
         ///   A task that represents the asynchronous operation. The task's result is
         ///   a sequence of IPFS keys.
         /// </returns>
-        Task<IEnumerable<IFilesStoreKey>> ListAsync(CancellationToken cancel = default);
+        Task<IEnumerable<IKey>> ListAsync(CancellationToken cancel = default);
 
         /// <summary>
         ///   Delete the specified key.
@@ -65,7 +65,7 @@ Task<IFilesStoreKey> CreateAsync(
         ///   A task that represents the asynchronous operation. The task's result is
         ///   the key that was deleted, or null if the key is not present.
         /// </returns>
-        Task<IFilesStoreKey?> RemoveAsync(string name, CancellationToken cancel = default);
+        Task<IKey?> RemoveAsync(string name, CancellationToken cancel = default);
 
         /// <summary>
         ///   Rename the specified key.
@@ -83,7 +83,7 @@ Task<IFilesStoreKey> CreateAsync(
         ///   A task that represents the asynchronous operation. The task's result is
         ///   the new key after the rename.
         /// </returns>
-        Task<IFilesStoreKey> RenameAsync(string oldName, string newName, CancellationToken cancel = default);
+        Task<IKey> RenameAsync(string oldName, string newName, CancellationToken cancel = default);
 
         /// <summary>
         ///   Export a key to a PEM encoded password protected PKCS #8 container.
@@ -122,6 +122,6 @@ Task<IFilesStoreKey> CreateAsync(
         ///    A task that represents the asynchronous operation. The task's result
         ///    is the newly imported key.
         /// </returns>
-        Task<IFilesStoreKey> ImportAsync(string name, string pem, char[]? password = null, CancellationToken cancel = default);
+        Task<IKey> ImportAsync(string name, string pem, char[]? password = null, CancellationToken cancel = default);
     }
 }