diff --git a/VoldNativeService.h b/VoldNativeService.h
index 6debe77..e98aea8 100644
--- a/VoldNativeService.h
+++ b/VoldNativeService.h
@@ -112,14 +112,14 @@
 
     binder::Status setStorageBindingSeed(const std::vector<uint8_t>& seed);
 
-    binder::Status createUserKey(int32_t userId, int32_t userSerial, bool ephemeral);
-    binder::Status destroyUserKey(int32_t userId);
+    binder::Status createUserStorageKeys(int32_t userId, int32_t userSerial, bool ephemeral);
+    binder::Status destroyUserStorageKeys(int32_t userId);
 
-    binder::Status setUserKeyProtection(int32_t userId, const std::string& secret);
+    binder::Status setCeStorageProtection(int32_t userId, const std::string& secret);
 
     binder::Status getUnlockedUsers(std::vector<int>* _aidl_return);
-    binder::Status unlockUserKey(int32_t userId, int32_t userSerial, const std::string& secret);
-    binder::Status lockUserKey(int32_t userId);
+    binder::Status unlockCeStorage(int32_t userId, int32_t userSerial, const std::string& secret);
+    binder::Status lockCeStorage(int32_t userId);
 
     binder::Status prepareUserStorage(const std::optional<std::string>& uuid, int32_t userId,
                                       int32_t userSerial, int32_t flags);