diff --git a/examples/attachment.py b/examples/attachment.py
index 8568cdd..ddaf929 100644
--- a/examples/attachment.py
+++ b/examples/attachment.py
@@ -16,7 +16,7 @@ async def main() -> None:
         # Ask the agent to use the attachment.
         response = await window.agent(
             prompt="Summarize the attached file.",
-            agent=Agent.GENERALIST,
+            agent=Agent.CORE_AGENT,
             attachment=file,
         )
 
diff --git a/examples/choose_agent.py b/examples/choose_agent.py
index baa4fc6..28ccea6 100644
--- a/examples/choose_agent.py
+++ b/examples/choose_agent.py
@@ -10,7 +10,7 @@ async def main() -> None:
         window = await narada.open_and_initialize_browser_window()
 
         # Choose a specific agent to handle the task. By default, the Operator agent is used.
-        response = await window.agent(prompt="Tell me a joke.", agent=Agent.GENERALIST)
+        response = await window.agent(prompt="Tell me a joke.", agent=Agent.CORE_AGENT)
 
         print("Response:", response.model_dump_json(indent=2))
 
diff --git a/examples/complex_workflow.py b/examples/complex_workflow.py
index 86395a7..149b045 100644
--- a/examples/complex_workflow.py
+++ b/examples/complex_workflow.py
@@ -23,7 +23,7 @@ async def main() -> None:
 
         resp = await window.agent(
             prompt="What are the top 2 AI papers based on the current page?",
-            agent=Agent.GENERALIST,
+            agent=Agent.CORE_AGENT,
             output_schema=Papers,
         )
 
diff --git a/examples/conversation.py b/examples/conversation.py
index d9d8ad7..2611117 100644
--- a/examples/conversation.py
+++ b/examples/conversation.py
@@ -11,7 +11,7 @@ async def main() -> None:
 
         resp = await window.agent(
             prompt="Pick a lucky number for me between 1 and 100",
-            agent=Agent.GENERALIST,
+            agent=Agent.CORE_AGENT,
             # By default, the chat history is cleared when an agent is invoked so that the agent can
             # start fresh.
             clear_chat=True,
@@ -20,7 +20,7 @@ async def main() -> None:
 
         resp = await window.agent(
             prompt="What did you pick again?",
-            agent=Agent.GENERALIST,
+            agent=Agent.CORE_AGENT,
             # By not clearing the chat history, we can continue the conversation.
             clear_chat=False,
         )
@@ -28,7 +28,7 @@ async def main() -> None:
 
         resp = await window.agent(
             prompt="What's double that number?",
-            agent=Agent.GENERALIST,
+            agent=Agent.CORE_AGENT,
             # By not clearing the chat history, we can continue the conversation.
             clear_chat=False,
         )
diff --git a/packages/narada-core/src/narada_core/models.py b/packages/narada-core/src/narada_core/models.py
index 0e3ca3b..8e03292 100644
--- a/packages/narada-core/src/narada_core/models.py
+++ b/packages/narada-core/src/narada_core/models.py
@@ -7,13 +7,13 @@
 
 
 class Agent(Enum):
-    GENERALIST = 1
+    PRODUCTIVITY = 1
     OPERATOR = 2
     CORE_AGENT = 3
 
     def prompt_prefix(self) -> str:
         match self:
-            case Agent.GENERALIST:
+            case Agent.PRODUCTIVITY:
                 return ""
             case Agent.OPERATOR:
                 return "/Operator "
@@ -99,7 +99,7 @@ class PrintTrace(TypedDict):
 class AgentTrace(TypedDict):
     step_type: Literal["agent"]
     url: str
-    agent_type: str  # e.g., 'operator', 'generalist', 'coreAgent', etc.
+    agent_type: str  # e.g., 'operator', 'productivity', 'coreAgent', etc.
     action_trace: ActionTrace
     text: str  # For non-operator agents