Fix for kdf-keys rename