diff --git a/lib/flagsmith/engine/mappers.rb b/lib/flagsmith/engine/mappers.rb
index d9baa8a..612a84c 100644
--- a/lib/flagsmith/engine/mappers.rb
+++ b/lib/flagsmith/engine/mappers.rb
@@ -43,7 +43,7 @@ def self.map_environment_model_to_evaluation_context(environment)
       # @param override_traits [Array<Flagsmith::Engine::Identities::Trait>, nil] Optional override traits
       # @return [Hash] Identity context with :identifier, :key, and :traits
       def self.map_identity_model_to_identity_context(identity, override_traits = nil)
-        Identity.build_environment_context(identity, override_traits)
+        Identity.build_identity_context(identity, override_traits)
       end
 
       # Maps segment rule model to rule hash
diff --git a/lib/flagsmith/engine/mappers/identity.rb b/lib/flagsmith/engine/mappers/identity.rb
index 45dc374..e14ca07 100644
--- a/lib/flagsmith/engine/mappers/identity.rb
+++ b/lib/flagsmith/engine/mappers/identity.rb
@@ -5,12 +5,12 @@ module Engine
     module Mappers
       # Handles identity and override mapping
       module Identity
-        def self.build_environment_context(identity, override_traits = nil)
+        def self.build_identity_context(identity, override_traits = nil)
           traits = override_traits || identity.identity_traits
 
           {
             identifier: identity.identifier,
-            key: identity.django_id&.to_s || identity.composite_key,
+            key: identity.composite_key,
             traits: build_traits_hash(traits)
           }
         end