diff --git a/lib/webauthn/authenticator_data/attested_credential_data.rb b/lib/webauthn/authenticator_data/attested_credential_data.rb
index 94e1db37..147cb015 100644
--- a/lib/webauthn/authenticator_data/attested_credential_data.rb
+++ b/lib/webauthn/authenticator_data/attested_credential_data.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "webauthn/authenticator_data/attested_credential_data/public_key_u2f"
+require "webauthn/authenticator_data/attested_credential_data/public_key"
 
 module WebAuthn
   class AuthenticatorData
@@ -57,7 +57,7 @@ def id
       end
 
       def public_key
-        @public_key ||= PublicKeyU2f.new(data_at(public_key_position, public_key_length))
+        @public_key ||= PublicKey.new(data_at(public_key_position, public_key_length))
       end
 
       def id_position
diff --git a/lib/webauthn/authenticator_data/attested_credential_data/public_key_u2f.rb b/lib/webauthn/authenticator_data/attested_credential_data/public_key.rb
similarity index 96%
rename from lib/webauthn/authenticator_data/attested_credential_data/public_key_u2f.rb
rename to lib/webauthn/authenticator_data/attested_credential_data/public_key.rb
index 1fbe3773..a458210d 100644
--- a/lib/webauthn/authenticator_data/attested_credential_data/public_key_u2f.rb
+++ b/lib/webauthn/authenticator_data/attested_credential_data/public_key.rb
@@ -6,7 +6,7 @@
 module WebAuthn
   class AuthenticatorData
     class AttestedCredentialData
-      class PublicKeyU2f
+      class PublicKey
         COORDINATE_LENGTH = 32
 
         def initialize(data)