diff --git a/core/src/main/java/io/temporal/samples/taskinteraction/Task.java b/core/src/main/java/io/temporal/samples/taskinteraction/Task.java
index 8b7e711d..ac62240b 100644
--- a/core/src/main/java/io/temporal/samples/taskinteraction/Task.java
+++ b/core/src/main/java/io/temporal/samples/taskinteraction/Task.java
@@ -25,13 +25,13 @@ public class Task {
 
   private String token;
   private Object data;
-  private STATE state;
+  private State state;
 
   public Task() {}
 
   public Task(String token) {
     this.token = token;
-    this.state = STATE.PENDING;
+    this.state = State.pending;
   }
 
   public String getToken() {
@@ -46,17 +46,17 @@ public <T> T result(Class<T> tClass) {
     return (T) data;
   }
 
-  public void setState(STATE state) {
+  public void setState(State state) {
     this.state = state;
   }
 
-  public STATE getState() {
+  public State getState() {
     return state;
   }
 
   @JsonIgnore
   public boolean isCompleted() {
-    return STATE.COMPLETED == this.state;
+    return State.completed == this.state;
   }
 
   @Override
@@ -64,9 +64,9 @@ public String toString() {
     return "Task{" + "token='" + token + '\'' + ", data=" + data + ", state=" + state + '}';
   }
 
-  public enum STATE {
-    PENDING,
-    STARTED,
-    COMPLETED
+  public enum State {
+    pending,
+    started,
+    completed
   }
 }
diff --git a/core/src/main/java/io/temporal/samples/taskinteraction/TaskService.java b/core/src/main/java/io/temporal/samples/taskinteraction/TaskService.java
index cb7c3abd..b12c8d81 100644
--- a/core/src/main/java/io/temporal/samples/taskinteraction/TaskService.java
+++ b/core/src/main/java/io/temporal/samples/taskinteraction/TaskService.java
@@ -55,7 +55,7 @@ public void updateTask(TaskRequest taskRequest) {
 
           logger.info("Task updated: " + t);
 
-          if (taskRequest.state == Task.STATE.COMPLETED) {
+          if (taskRequest.state == Task.State.completed) {
             final CompletablePromise<R> completablePromise = pendingPromises.get(token);
             completablePromise.complete((R) data);
           }
@@ -101,13 +101,13 @@ public interface Callback<T> {
 
   public static class TaskRequest {
 
-    private Task.STATE state;
+    private Task.State state;
     private String data;
     private String token;
 
     public TaskRequest() {}
 
-    public TaskRequest(Task.STATE state, String data, String token) {
+    public TaskRequest(Task.State state, String data, String token) {
       this.state = state;
       this.data = data;
       this.token = token;
@@ -115,7 +115,7 @@ public TaskRequest(Task.STATE state, String data, String token) {
 
     @JsonIgnore
     public boolean isCompleted() {
-      return this.state == Task.STATE.COMPLETED;
+      return this.state == Task.State.completed;
     }
 
     public String getToken() {
diff --git a/core/src/main/java/io/temporal/samples/taskinteraction/client/UpdateTask.java b/core/src/main/java/io/temporal/samples/taskinteraction/client/UpdateTask.java
index f31d5bee..aeaa8209 100644
--- a/core/src/main/java/io/temporal/samples/taskinteraction/client/UpdateTask.java
+++ b/core/src/main/java/io/temporal/samples/taskinteraction/client/UpdateTask.java
@@ -41,9 +41,9 @@ public static void main(String[] args) {
     final List<Task> openTasks = taskClient.getOpenTasks();
 
     final Task randomOpenTask = openTasks.get(0);
-    final List<Task.STATE> states = Arrays.asList(Task.STATE.values());
+    final List<Task.State> states = Arrays.asList(Task.State.values());
 
-    final Task.STATE nextState = states.get(states.indexOf(randomOpenTask.getState()) + 1);
+    final Task.State nextState = states.get(states.indexOf(randomOpenTask.getState()) + 1);
 
     System.out.println("\nUpdating task " + randomOpenTask + " to " + nextState);
     taskClient.updateTask(
diff --git a/core/src/test/java/io/temporal/samples/taskinteraction/TaskWorkflowImplTest.java b/core/src/test/java/io/temporal/samples/taskinteraction/TaskWorkflowImplTest.java
index cd42cfb6..5cf855d8 100644
--- a/core/src/test/java/io/temporal/samples/taskinteraction/TaskWorkflowImplTest.java
+++ b/core/src/test/java/io/temporal/samples/taskinteraction/TaskWorkflowImplTest.java
@@ -80,20 +80,20 @@ public void testRunWorkflow() throws InterruptedException, ExecutionException {
     final List<Task> asyncTasksStarted = taskClient.getOpenTasks();
     assertEquals(2, asyncTasksStarted.size());
     // Change tasks state, not completing them yet
-    changeTaskState(taskClient, asyncTasksStarted, Task.STATE.STARTED);
+    changeTaskState(taskClient, asyncTasksStarted, Task.State.started);
 
     // The two tasks are still open, lets complete them
     final List<Task> asyncTasksPending = taskClient.getOpenTasks();
     assertEquals(2, asyncTasksPending.size());
-    changeTaskState(taskClient, asyncTasksPending, Task.STATE.COMPLETED);
+    changeTaskState(taskClient, asyncTasksPending, Task.State.completed);
 
     // Wait for the activity to get executed for the third time. One more task gets created
     completedActivities[0].get();
 
     final List<Task> syncTask = taskClient.getOpenTasks();
     assertEquals(1, syncTask.size());
-    changeTaskState(taskClient, syncTask, Task.STATE.STARTED);
-    changeTaskState(taskClient, syncTask, Task.STATE.COMPLETED);
+    changeTaskState(taskClient, syncTask, Task.State.started);
+    changeTaskState(taskClient, syncTask, Task.State.completed);
 
     // Workflow completes
     final WorkflowStub untyped =
@@ -101,7 +101,7 @@ public void testRunWorkflow() throws InterruptedException, ExecutionException {
     untyped.getResult(String.class);
   }
 
-  private static void changeTaskState(TaskClient client, List<Task> tasks, Task.STATE state) {
+  private static void changeTaskState(TaskClient client, List<Task> tasks, Task.State state) {
     tasks.forEach(
         t -> {
           client.updateTask(