diff --git a/src/main/java/dev/openfeature/javasdk/OpenFeatureAPI.java b/src/main/java/dev/openfeature/javasdk/OpenFeatureAPI.java
index 5f4c0415..76bb3cb3 100644
--- a/src/main/java/dev/openfeature/javasdk/OpenFeatureAPI.java
+++ b/src/main/java/dev/openfeature/javasdk/OpenFeatureAPI.java
@@ -19,7 +19,7 @@ public class OpenFeatureAPI {
     private FeatureProvider provider;
     @Getter
     @Setter
-    private EvaluationContext ctx;
+    private EvaluationContext evaluationContext;
     @Getter
     private List<Hook> apiHooks;
 
diff --git a/src/main/java/dev/openfeature/javasdk/OpenFeatureClient.java b/src/main/java/dev/openfeature/javasdk/OpenFeatureClient.java
index 4cddd808..6b8d7f2b 100644
--- a/src/main/java/dev/openfeature/javasdk/OpenFeatureClient.java
+++ b/src/main/java/dev/openfeature/javasdk/OpenFeatureClient.java
@@ -78,7 +78,7 @@ public class OpenFeatureClient implements Client {
             // merge of: API.context, client.context, invocation.context
             EvaluationContext mergedCtx = EvaluationContext.merge(
                     EvaluationContext.merge(
-                            openfeatureApi.getCtx(),
+                            openfeatureApi.getEvaluationContext(),
                             this.getEvaluationContext()
                     ),
                     invocationCtx
diff --git a/src/test/java/dev/openfeature/javasdk/FlagEvaluationSpecTest.java b/src/test/java/dev/openfeature/javasdk/FlagEvaluationSpecTest.java
index be3e4830..de58b4f0 100644
--- a/src/test/java/dev/openfeature/javasdk/FlagEvaluationSpecTest.java
+++ b/src/test/java/dev/openfeature/javasdk/FlagEvaluationSpecTest.java
@@ -33,7 +33,7 @@ class FlagEvaluationSpecTest implements HookFixtures {
 
     @AfterEach void reset_ctx() {
         OpenFeatureAPI api = OpenFeatureAPI.getInstance();
-        api.setCtx(null);
+        api.setEvaluationContext(null);
     }
 
     @Specification(number="1.1.1", text="The API, and any state it maintains SHOULD exist as a global singleton, even in cases wherein multiple versions of the API are present at runtime.")
@@ -235,7 +235,7 @@ class FlagEvaluationSpecTest implements HookFixtures {
         apiCtx.add("common", "1");
         apiCtx.add("common2", "1");
         apiCtx.add("api", "2");
-        api.setCtx(apiCtx);
+        api.setEvaluationContext(apiCtx);
 
         Client c = api.getClient();
         EvaluationContext clientCtx = new EvaluationContext();