diff --git a/client/App.vue b/client/App.vue
index ea71b229..bb889ef2 100644
--- a/client/App.vue
+++ b/client/App.vue
@@ -145,8 +145,8 @@ export default {
       <div class="detail-view workflow-id" v-if="$route.params.workflowId">
         <span>{{ $route.params.workflowId }}</span>
       </div>
-      <div class="detail-view task-list" v-if="$route.params.taskList">
-        <span>{{ $route.params.taskList }}</span>
+      <div class="detail-view task-queue" v-if="$route.params.taskQueue">
+        <span>{{ $route.params.taskQueue }}</span>
       </div>
     </header>
     <router-view @onNotification="onNotification"></router-view>
@@ -233,7 +233,7 @@ header.top-bar
     margin-right spacing
   div.workflow-id span::before
       content 'WORKFLOW ID'
-  div.task-list span::before
+  div.task-queue span::before
       content 'TASK LIST'
   .version {
     color: #c6c6c6;
diff --git a/client/helpers/get-key-value-pairs.js b/client/helpers/get-key-value-pairs.js
index 0e9f6a73..8c792088 100644
--- a/client/helpers/get-key-value-pairs.js
+++ b/client/helpers/get-key-value-pairs.js
@@ -2,7 +2,7 @@ import moment from 'moment';
 import getJsonStringObject from './get-json-string-object';
 import { jsonKeys, preKeys } from '~constants';
 
-const getKeyValuePairs = event => {
+const getKeyValuePairs = (event) => {
   const kvps = [];
   const flatten = (prefix, obj, root) => {
     Object.entries(obj).forEach(([k, value]) => {
@@ -57,13 +57,13 @@ const getKeyValuePairs = event => {
           },
           value,
         });
-      } else if (key === 'taskList.name' || key === 'Tasklist') {
+      } else if (key === 'taskQueue.name' || key === 'Taskqueue') {
         kvps.push({
           key,
           routeLink: {
-            name: 'task-list',
+            name: 'task-queue',
             params: {
-              taskList: value,
+              taskQueue: value,
             },
           },
           value,
diff --git a/client/main.js b/client/main.js
index faa2d2d7..abb268ff 100644
--- a/client/main.js
+++ b/client/main.js
@@ -20,7 +20,7 @@ import History from './routes/workflow/history';
 import Query from './routes/workflow/query';
 import Root from './routes';
 import StackTrace from './routes/workflow/stack-trace';
-import TaskList from './routes/namespace/task-list';
+import TaskQueue from './routes/namespace/task-queue';
 import WorkflowArchival from './routes/namespace/workflow-archival';
 import WorkflowArchivalAdvanced from './routes/namespace/workflow-archival/advanced';
 import WorkflowArchivalBasic from './routes/namespace/workflow-archival/basic';
@@ -154,9 +154,9 @@ const routeOpts = {
       ],
     },
     {
-      name: 'task-list',
-      path: '/namespaces/:namespace/task-lists/:taskList',
-      component: TaskList,
+      name: 'task-queue',
+      path: '/namespaces/:namespace/task-queues/:taskQueue',
+      component: TaskQueue,
     },
 
     // redirects
@@ -198,7 +198,7 @@ const routeOpts = {
     },
   ],
   parseQuery: qs.parse.bind(qs),
-  stringifyQuery: query => {
+  stringifyQuery: (query) => {
     const q = qs.stringify(query);
 
     return q ? `?${q}` : '';
@@ -267,11 +267,11 @@ if (typeof mocha === 'undefined') {
   });
 
   if (module.hot) {
-    module.hot.addStatusHandler(status => {
+    module.hot.addStatusHandler((status) => {
       if (status === 'apply') {
         document
           .querySelectorAll('link[href][rel=stylesheet]')
-          .forEach(link => {
+          .forEach((link) => {
             const nextStyleHref = link.href.replace(
               /(\?\d+)?$/,
               `?${Date.now()}`
diff --git a/client/routes/namespace/task-list.vue b/client/routes/namespace/task-queue.vue
similarity index 76%
rename from client/routes/namespace/task-list.vue
rename to client/routes/namespace/task-queue.vue
index 881785da..ead9b04c 100644
--- a/client/routes/namespace/task-list.vue
+++ b/client/routes/namespace/task-queue.vue
@@ -1,5 +1,5 @@
 <template>
-  <section :class="{ 'task-list': true, loading }">
+  <section :class="{ 'task-queue': true, loading }">
     <header><h3>Pollers</h3></header>
     <table v-if="pollers">
       <thead>
@@ -33,18 +33,18 @@ export default {
   },
   created() {
     this.$http(
-      `/api/namespaces/${this.$route.params.namespace}/task-lists/${this.$route.params.taskList}/pollers`
+      `/api/namespaces/${this.$route.params.namespace}/task-queues/${this.$route.params.taskQueue}/pollers`
     )
       .then(
-        p => {
-          this.pollers = Object.keys(p).map(identity => ({
+        (p) => {
+          this.pollers = Object.keys(p).map((identity) => ({
             identity,
             lastAccessTime: moment(p[identity].lastAccessTime),
-            handlesDecisions: p[identity].taskListTypes.includes('decision'),
-            handlesActivities: p[identity].taskListTypes.includes('activity'),
+            handlesDecisions: p[identity].taskQueueTypes.includes('decision'),
+            handlesActivities: p[identity].taskQueueTypes.includes('activity'),
           }));
         },
-        e => {
+        (e) => {
           this.error = (e.json && e.json.message) || e.status || e.message;
         }
       )
@@ -59,7 +59,7 @@ export default {
 <style lang="stylus">
 @require "../../styles/definitions.styl"
 
-section.task-list
+section.task-queue
   > header
     padding inline-spacing-medium
   table
diff --git a/client/routes/workflow/helpers/summarize-events.js b/client/routes/workflow/helpers/summarize-events.js
index 8896076a..387c8b9f 100644
--- a/client/routes/workflow/helpers/summarize-events.js
+++ b/client/routes/workflow/helpers/summarize-events.js
@@ -4,13 +4,13 @@ import workflowLink from './workflow-link';
 import { shortName } from '~helpers';
 
 export const summarizeEvents = {
-  ActivityTaskCancelRequested: d => ({ Id: d.activityId }),
-  ActivityTaskCompleted: d => ({ result: d.result }),
-  ActivityTaskFailed: d => ({
+  ActivityTaskCancelRequested: (d) => ({ Id: d.activityId }),
+  ActivityTaskCompleted: (d) => ({ result: d.result }),
+  ActivityTaskFailed: (d) => ({
     details: d.details,
     reason: d.reason,
   }),
-  ActivityTaskScheduled: d => ({
+  ActivityTaskScheduled: (d) => ({
     'Close Timeout': moment
       .duration(d.scheduleToCloseTimeoutSeconds, 'seconds')
       .format(),
@@ -18,30 +18,30 @@ export const summarizeEvents = {
     input: d.input,
     Name: shortName(d.activityType.name),
   }),
-  ActivityTaskStarted: d => ({
+  ActivityTaskStarted: (d) => ({
     attempt: d.attempt,
     identity: d.identity,
     requestId: d.requestId,
   }),
-  ActivityTaskTimedOut: d => ({ 'Timeout Type': d.timeoutType }),
-  ChildWorkflowExecutionCompleted: d => ({
+  ActivityTaskTimedOut: (d) => ({ 'Timeout Type': d.timeoutType }),
+  ChildWorkflowExecutionCompleted: (d) => ({
     result: d.result,
     Workflow: workflowLink(d, true),
   }),
-  ChildWorkflowExecutionStarted: d => ({
+  ChildWorkflowExecutionStarted: (d) => ({
     Workflow: workflowLink(d),
   }),
-  DecisionTaskCompleted: d => ({ identity: d.identity }),
-  DecisionTaskScheduled: d => ({
-    Tasklist: d.taskList.name,
+  DecisionTaskCompleted: (d) => ({ identity: d.identity }),
+  DecisionTaskScheduled: (d) => ({
+    Taskqueue: d.taskQueue.name,
     Timeout: moment.duration(d.startToCloseTimeoutSeconds, 'seconds').format(),
   }),
-  DecisionTaskStarted: d => ({ requestId: d.requestId }),
-  DecisionTaskTimedOut: d => ({ 'Timeout Type': d.timeoutType }),
-  ExternalWorkflowExecutionSignaled: d => ({
+  DecisionTaskStarted: (d) => ({ requestId: d.requestId }),
+  DecisionTaskTimedOut: (d) => ({ 'Timeout Type': d.timeoutType }),
+  ExternalWorkflowExecutionSignaled: (d) => ({
     Workflow: workflowLink(d),
   }),
-  MarkerRecorded: d => {
+  MarkerRecorded: (d) => {
     const details = d.details || {};
 
     if (d.markerName === 'LocalActivity') {
@@ -78,23 +78,23 @@ export const summarizeEvents = {
 
     return d;
   },
-  StartChildWorkflowExecutionInitiated: d => ({
+  StartChildWorkflowExecutionInitiated: (d) => ({
     input: d.input,
-    Tasklist: d.taskList.name,
+    Taskqueue: d.taskQueue.name,
     Workflow: shortName(d.workflowType.name),
   }),
-  SignalExternalWorkflowExecutionInitiated: d => ({
+  SignalExternalWorkflowExecutionInitiated: (d) => ({
     input: d.input,
     signal: d.signalName,
     Workflow: workflowLink(d),
   }),
-  TimerStarted: d => ({
+  TimerStarted: (d) => ({
     'Fire Timeout': moment
       .duration(d.startToFireTimeoutSeconds, 'seconds')
       .format(),
     'Timer ID': d.timerId,
   }),
-  WorkflowExecutionStarted: d => {
+  WorkflowExecutionStarted: (d) => {
     const summary = {
       'Close Timeout': moment
         .duration(d.executionStartToCloseTimeoutSeconds, 'seconds')
@@ -115,7 +115,7 @@ export const summarizeEvents = {
 
     return summary;
   },
-  WorkflowExecutionFailed: d => {
+  WorkflowExecutionFailed: (d) => {
     return { message: d.failure.message };
   },
 };
diff --git a/client/routes/workflow/summary.vue b/client/routes/workflow/summary.vue
index 308e8c02..a21171f0 100644
--- a/client/routes/workflow/summary.vue
+++ b/client/routes/workflow/summary.vue
@@ -91,18 +91,18 @@
           </router-link>
         </dd>
       </div>
-      <div class="task-list">
-        <dt>Task List</dt>
+      <div class="task-queue">
+        <dt>Task Queue</dt>
         <dd>
           <router-link
             :to="{
-              name: 'task-list',
+              name: 'task-queue',
               params: {
-                taskList: workflow.executionConfig.taskList.name,
+                taskQueue: workflow.executionConfig.taskQueue.name,
               },
             }"
           >
-            {{ workflow.executionConfig.taskList.name }}
+            {{ workflow.executionConfig.taskQueue.name }}
           </router-link>
         </dd>
       </div>
@@ -198,7 +198,7 @@ export default {
           reason: this.terminationReason,
         })
         .then(
-          r => {
+          (r) => {
             this.$emit('onNotification', {
               message: 'Workflow terminated.',
               type: NOTIFICATION_TYPE_SUCCESS,
@@ -206,7 +206,7 @@ export default {
             // eslint-disable-next-line no-console
             console.dir(r);
           },
-          error => {
+          (error) => {
             this.$emit('onNotification', {
               message: getErrorMessage(error, TERMINATE_DEFAULT_ERROR_MESSAGE),
               type: NOTIFICATION_TYPE_ERROR,
@@ -246,7 +246,7 @@ section.workflow-summary
     margin-bottom 1em
     dt
       padding 0 4px
-  .run-id, .task-list, .workflow-id, .workflow-name
+  .run-id, .task-queue, .workflow-id, .workflow-name
     dd
       font-weight 300
       font-family monospace-font-family
diff --git a/client/test/fixtures.js b/client/test/fixtures.js
index 673e8a10..1a905095 100644
--- a/client/test/fixtures.js
+++ b/client/test/fixtures.js
@@ -15,7 +15,8 @@ export default {
     open: [
       {
         execution: {
-          workflowId: 'github.com/temporalio/temporal-web/email-daily-summaries-2',
+          workflowId:
+            'github.com/temporalio/temporal-web/email-daily-summaries-2',
           runId: 'ef2c889e-e709-4d50-99ee-3748dfa0a101',
         },
         type: {
@@ -66,7 +67,7 @@ export default {
           workflowType: {
             name: 'email-daily-summaries',
           },
-          taskList: {
+          taskQueue: {
             name: 'ci-task-queue',
           },
           input: [839134, { env: 'prod' }],
@@ -79,7 +80,7 @@ export default {
         eventType: 'DecisionTaskScheduled',
         eventId: 2,
         details: {
-          taskList: {
+          taskQueue: {
             name: 'ci-task-queue',
           },
           zero: 0,
@@ -124,7 +125,7 @@ export default {
           activityType: {
             name: 'send-emails',
           },
-          taskList: {
+          taskQueue: {
             name: 'ci-task-queue',
           },
           input: [12345, ['bob@example.com', 'jane@somewhere.com']],
@@ -159,7 +160,7 @@ export default {
         timestamp: emailRun1Start.add(11, 'second').toISOString(),
         eventType: 'DecisionTaskScheduled',
         eventId: 9,
-        details: { taskList: { name: 'ci-task-queue' } },
+        details: { taskQueue: { name: 'ci-task-queue' } },
       },
       {
         timestamp: emailRun1Start.add(11, 'second').toISOString(),
@@ -196,7 +197,7 @@ export default {
       {
         details: {
           executionStartToCloseTimeoutSeconds: 360,
-          taskList: {
+          taskQueue: {
             name: 'canary-task-queue',
           },
           taskStartToCloseTimeoutSeconds: 180,
@@ -249,7 +250,7 @@ export default {
           scheduleToCloseTimeoutSeconds: 2,
           scheduleToStartTimeoutSeconds: 1,
           startToCloseTimeoutSeconds: 1,
-          taskList: {
+          taskQueue: {
             name: 'ci-task-queue',
           },
         },
@@ -279,7 +280,7 @@ export default {
       {
         details: {
           startToCloseTimeoutSeconds: 180,
-          taskList: {
+          taskQueue: {
             name: 'compute3330-sjc1:43b62b8e-aa2a-4b58-9571-39062a073d24',
           },
         },
@@ -324,7 +325,7 @@ export default {
           workflowType: {
             name: 'email-daily-summaries',
           },
-          taskList: {
+          taskQueue: {
             name: 'ci-task-queue',
           },
           input: [839134, { env: 'prod' }],
@@ -337,7 +338,7 @@ export default {
         eventType: 'DecisionTaskScheduled',
         eventId: 2,
         details: {
-          taskList: {
+          taskQueue: {
             name: 'ci-task-queue',
           },
           zero: 0,
@@ -382,7 +383,7 @@ export default {
           activityType: {
             name: 'search-for-treasure',
           },
-          taskList: {
+          taskQueue: {
             name: 'ci-task-queue',
           },
           input: { location: 'volcanic island' },
@@ -427,7 +428,7 @@ export default {
         eventId: 10,
         details: {
           workflowType: { name: 'sail-the-ocean' },
-          taskList: { name: 'another-queue' },
+          taskQueue: { name: 'another-queue' },
           input: { direction: 'west' },
         },
       },
@@ -454,7 +455,7 @@ export default {
           activityType: {
             name: 'swab-the-deck',
           },
-          taskList: {
+          taskQueue: {
             name: 'ci-task-queue',
           },
           input: { moveTheGrogToo: true },
diff --git a/client/test/help.test.js b/client/test/help.test.js
index e2e74dd6..1a915a00 100644
--- a/client/test/help.test.js
+++ b/client/test/help.test.js
@@ -43,7 +43,7 @@ describe('Help', () => {
         'tctl --env {staging|prod|prod02} --namespace {namespace-name} namespace describe',
         'tctl --env {staging|prod|prod02} --namespace {namespace-name} namespace update -active_cluster {cluster-name}',
         'tctl --env {staging|prod|prod02} --namespace {namespace-name} namespace update --add_bad_binary {bad-binary-SHA} --reason \'"{reason}"\'',
-        'tctl --env {staging|prod|prod02} --namespace {namespace-name} workflow run --tl {task-list-name} --wt {workflow-type-name} --et 60 -i \'"{input-string}"\'',
+        'tctl --env {staging|prod|prod02} --namespace {namespace-name} workflow run --tq {task-queue-name} --wt {workflow-type-name} --et 60 -i \'"{input-string}"\'',
         'tctl --env {staging|prod|prod02} --namespace {namespace-name} workflow describe -w {workflow-id} -r {run-id}',
         'tctl --env {staging|prod|prod02} --namespace {namespace-name} workflow show -w {workflow-id} -r {run-id}',
         'tctl --env {staging|prod|prod02} --namespace {namespace-name} workflow signal -w {workflow-id} -r {run-id} --name {signal-name} --input \'"{signal-payload}"\'',
diff --git a/client/test/index.js b/client/test/index.js
index 162fff58..9adc43e7 100644
--- a/client/test/index.js
+++ b/client/test/index.js
@@ -1,5 +1,5 @@
 if (module.hot) {
-  module.hot.addStatusHandler(status => {
+  module.hot.addStatusHandler((status) => {
     if (status === 'apply') {
       window.location.reload();
     }
@@ -81,7 +81,7 @@ window.it = function it(...args) {
 
         return result.then(
           () => currScenario && currScenario.tearDown(this.test),
-          e =>
+          (e) =>
             currScenario
               ? currScenario.tearDown(this.test).then(
                   () => Promise.reject(e),
@@ -114,7 +114,7 @@ HTMLElement.prototype.selectItem = async function selectItem(text) {
 
   const itemToClick = Array.from(
     await this.waitUntilAllExist('ul.dropdown-menu li a')
-  ).find(a => a.innerText.trim() === text);
+  ).find((a) => a.innerText.trim() === text);
   const selectedItem = new MouseEvent('mousedown');
 
   itemToClick.dispatchEvent(selectedItem);
@@ -139,6 +139,6 @@ require('./help.test');
 require('./workflow-list.test');
 require('./workflow.test');
 require('./namespace-settings.test');
-require('./task-list.test');
+require('./task-queue.test');
 
 mocha.run();
diff --git a/client/test/scenario.js b/client/test/scenario.js
index 9785d7d1..7fa31040 100644
--- a/client/test/scenario.js
+++ b/client/test/scenario.js
@@ -202,7 +202,7 @@ Scenario.prototype.withWorkflow = function withWorkflow(
 
   this.api.getOnce(this.execApiBase(), {
     executionConfig: {
-      taskList: { name: 'ci_task_list' },
+      taskQueue: { name: 'ci_task_queue' },
       executionStartToCloseTimeoutSeconds: 3600,
       taskStartToCloseTimeoutSeconds: 10,
       childPolicy: 'TERMINATE',
@@ -291,30 +291,30 @@ Scenario.prototype.withWorkflowTermination = function withWorkflowTermination(
   return this;
 };
 
-Scenario.prototype.withTaskListPollers = function withTaskListPollers(
-  taskList,
+Scenario.prototype.withTaskQueuePollers = function withTaskQueuePollers(
+  taskQueue,
   pollers
 ) {
   this.api.getOnce(
-    `/api/namespaces/${this.namespace}/task-lists/${taskList}/pollers`,
+    `/api/namespaces/${this.namespace}/task-queues/${taskQueue}/pollers`,
     pollers || {
       node1: {
         lastAccessTime: moment()
           .startOf('hour')
           .add(5, 'minutes'),
-        taskListTypes: ['decision', 'activity'],
+        taskQueueTypes: ['decision', 'activity'],
       },
       node2: {
         lastAccessTime: moment()
           .startOf('hour')
           .add(3, 'minutes'),
-        taskListTypes: ['decision'],
+        taskQueueTypes: ['decision'],
       },
       node3: {
         lastAccessTime: moment()
           .startOf('hour')
           .add(4, 'minutes'),
-        taskListTypes: ['activity'],
+        taskQueueTypes: ['activity'],
       },
     }
   );
diff --git a/client/test/task-list.test.js b/client/test/task-list.test.js
deleted file mode 100644
index 651bdbed..00000000
--- a/client/test/task-list.test.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import moment from 'moment';
-
-describe('Task List', () => {
-  async function taskListTest(mochaTest, pollers) {
-    const [testEl, scenario] = new Scenario(mochaTest)
-      .withNamespace('ci-test')
-      .startingAt('/namespaces/ci-test/task-lists/ci_task_list')
-      .withTaskListPollers('ci_task_list', pollers)
-      .go();
-
-    const taskListEl = await testEl.waitUntilExists('section.task-list');
-
-    return [taskListEl, scenario];
-  }
-
-  it('should show a table of the pollers of the task list', async function test() {
-    const [taskListEl] = await taskListTest(this.test);
-
-    await Promise.delay(1);
-
-    taskListEl.querySelectorAll('table tbody tr').should.have.length(3);
-    taskListEl
-      .textNodes('tbody tr td:first-child')
-      .should.deep.equal(['node1', 'node2', 'node3']);
-    taskListEl.textNodes('tbody tr td:nth-child(2)').should.deep.equal(
-      [5, 3, 4].map(m =>
-        moment()
-          .startOf('hour')
-          .add(m, 'minutes')
-          .format('ddd MMMM Do, h:mm:ss a')
-      )
-    );
-    taskListEl
-      .attrValues('tbody td:nth-child(3)', 'data-handled')
-      .should.deep.equal(['true', 'true', null]);
-    taskListEl
-      .attrValues('tbody td:nth-child(4)', 'data-handled')
-      .should.deep.equal(['true', null, 'true']);
-  });
-});
diff --git a/client/test/task-queue.test.js b/client/test/task-queue.test.js
new file mode 100644
index 00000000..5f940545
--- /dev/null
+++ b/client/test/task-queue.test.js
@@ -0,0 +1,40 @@
+import moment from 'moment';
+
+describe('Task Queue', () => {
+  async function taskQueueTest(mochaTest, pollers) {
+    const [testEl, scenario] = new Scenario(mochaTest)
+      .withNamespace('ci-test')
+      .startingAt('/namespaces/ci-test/task-queues/ci_task_queue')
+      .withTaskQueuePollers('ci_task_queue', pollers)
+      .go();
+
+    const taskQueueEl = await testEl.waitUntilExists('section.task-queue');
+
+    return [taskQueueEl, scenario];
+  }
+
+  it('should show a table of the pollers of the task queue', async function test() {
+    const [taskQueueEl] = await taskQueueTest(this.test);
+
+    await Promise.delay(1);
+
+    taskQueueEl.querySelectorAll('table tbody tr').should.have.length(3);
+    taskQueueEl
+      .textNodes('tbody tr td:first-child')
+      .should.deep.equal(['node1', 'node2', 'node3']);
+    taskQueueEl.textNodes('tbody tr td:nth-child(2)').should.deep.equal(
+      [5, 3, 4].map((m) =>
+        moment()
+          .startOf('hour')
+          .add(m, 'minutes')
+          .format('ddd MMMM Do, h:mm:ss a')
+      )
+    );
+    taskQueueEl
+      .attrValues('tbody td:nth-child(3)', 'data-handled')
+      .should.deep.equal(['true', 'true', null]);
+    taskQueueEl
+      .attrValues('tbody td:nth-child(4)', 'data-handled')
+      .should.deep.equal(['true', null, 'true']);
+  });
+});
diff --git a/client/test/workflow.test.js b/client/test/workflow.test.js
index b5afc456..e91c2337 100644
--- a/client/test/workflow.test.js
+++ b/client/test/workflow.test.js
@@ -64,9 +64,12 @@ describe('Workflow', () => {
           .querySelector('.workflow-name dd')
           .should.have.text('CIDemoWorkflow');
         summaryEl
-          .querySelector('.task-list dd a[href]')
-          .should.contain.text('ci_task_list')
-          .and.have.attr('href', '/namespaces/ci-test/task-lists/ci_task_list');
+          .querySelector('.task-queue dd a[href]')
+          .should.contain.text('ci_task_queue')
+          .and.have.attr(
+            'href',
+            '/namespaces/ci-test/task-queues/ci_task_queue'
+          );
         summaryEl.querySelector('.started-at dd').should.have.text(
           moment()
             .startOf('hour')
@@ -203,7 +206,7 @@ describe('Workflow', () => {
                 name:
                   'code.temporalio.internal/marketplace/dsp-scheduler/scheduler/workflow.CTBWorkflow',
               },
-              taskList: {
+              taskQueue: {
                 name: 'ctb-decider',
                 kind: null,
               },
@@ -735,7 +738,7 @@ describe('Workflow', () => {
             .should.deep.equal(
               fixtures.history.emailRun1
                 .filter((_value, index) => index < 6)
-                .map(e => moment(e.timestamp).format('MMM Do h:mm:ss a'))
+                .map((e) => moment(e.timestamp).format('MMM Do h:mm:ss a'))
             )
         );
         localStorage
@@ -753,7 +756,7 @@ describe('Workflow', () => {
             .should.deep.equal(
               fixtures.history.emailRun1
                 .filter((_value, index) => index < 6)
-                .map(e => moment(e.timestamp).format('MMM Do h:mm:ss a'))
+                .map((e) => moment(e.timestamp).format('MMM Do h:mm:ss a'))
             )
         );
       });
@@ -773,7 +776,7 @@ describe('Workflow', () => {
           .textNodes('dl.details dt')
           .should.deep.equal([
             'workflowType.name',
-            'taskList.name',
+            'taskQueue.name',
             'input',
             'executionStartToCloseTimeout',
             'taskStartToCloseTimeout',
diff --git a/package.json b/package.json
index 8f9b0a8b..5a30a5d8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "temporal-web",
-  "version": "0.25.0-web",
+  "version": "0.26.0-web",
   "description": "Temporal Web UI",
   "main": "server/index.js",
   "licence": "MIT",
diff --git a/server/middleware/workflow-client.js b/server/middleware/workflow-client.js
index dadedd6f..e75b6f7c 100644
--- a/server/middleware/workflow-client.js
+++ b/server/middleware/workflow-client.js
@@ -125,8 +125,10 @@ function enumTransform(item) {
     'event_type_workflow_execution',
     'event_type_decision_task',
     'event_type_activity_task',
-    'task_list_kind',
+    'task_queue_kind',
     'continue_as_new_initiator',
+    'event_type_timer',
+    'timeout_type',
   ];
 
   const itemL = item.toLowerCase();
@@ -189,7 +191,7 @@ function WorkflowClient() {
       `${dir}/temporal-proto/temporal/namespace/v1`,
       `${dir}/temporal-proto/temporal/query/v1`,
       `${dir}/temporal-proto/temporal/replication/v1`,
-      `${dir}/temporal-proto/temporal/tasklist/v1`,
+      `${dir}/temporal-proto/temporal/taskqueue/v1`,
       `${dir}/temporal-proto/temporal/version/v1`,
       `${dir}/temporal-proto/temporal/workflow/v1`,
       `${dir}/temporal-proto/temporal/workflowservice/v1`,
@@ -411,13 +413,13 @@ WorkflowClient.prototype.describeWorkflow = async function({
   return uiTransform(res);
 };
 
-WorkflowClient.prototype.describeTaskList = async function({
+WorkflowClient.prototype.describeTaskQueue = async function({
   namespace,
-  taskList,
-  taskListType,
+  taskQueue,
+  taskQueueType,
 }) {
-  const req = { namespace, taskList, taskListType };
-  const res = await this.client.describeTaskListAsync(req);
+  const req = { namespace, taskQueue, taskQueueType };
+  const res = await this.client.describeTaskQueueAsync(req);
 
   return uiTransform(res);
 };
diff --git a/server/routes.js b/server/routes.js
index 071ae8e3..e5a59aca 100644
--- a/server/routes.js
+++ b/server/routes.js
@@ -3,7 +3,7 @@ const Router = require('koa-router'),
   moment = require('moment'),
   Long = require('long'),
   losslessJSON = require('lossless-json'),
-  momentToLong = m => Long.fromValue(m.unix()).mul(1000000000),
+  momentToLong = (m) => Long.fromValue(m.unix()).mul(1000000000),
   WorkflowClient = require('./middleware/workflow-client');
 
 const wfClient = new WorkflowClient();
@@ -98,7 +98,7 @@ const buildQueryString = (
     workflowId && `WorkflowID = "${workflowId}"`,
     workflowName && `WorkflowType = "${workflowName}"`,
   ]
-    .filter(subQuery => !!subQuery)
+    .filter((subQuery) => !!subQuery)
     .join(' and ');
 };
 
@@ -180,7 +180,7 @@ router.get(
         /(KnownQueryTypes|knownTypes)=\[(.*)\]/
       ) || [null, null, ''])[2]
         .split(' ')
-        .filter(q => q);
+        .filter((q) => q);
     }
   }
 );
@@ -255,7 +255,7 @@ router.get(
       const {
         timestamp: startTime,
         details: {
-          taskList,
+          taskQueue,
           executionStartToCloseTimeoutSeconds,
           taskStartToCloseTimeoutSeconds,
           workflowType: type,
@@ -264,7 +264,7 @@ router.get(
 
       ctx.body = {
         executionConfig: {
-          taskList,
+          taskQueue,
           executionStartToCloseTimeoutSeconds,
           taskStartToCloseTimeoutSeconds,
         },
@@ -285,19 +285,19 @@ router.get(
 );
 
 router.get(
-  '/api/namespaces/:namespace/task-lists/:taskList/pollers',
+  '/api/namespaces/:namespace/task-queues/:taskQueue/pollers',
   async function(ctx) {
-    const { namespace, taskList } = ctx.params;
-    const descTaskList = async taskListType =>
+    const { namespace, taskQueue } = ctx.params;
+    const descTaskQueue = async (taskQueueType) =>
       (
-        await wfClient.describeTaskList({
+        await wfClient.describeTaskQueue({
           namespace,
-          taskList: { name: taskList },
-          taskListType,
+          taskQueue: { name: taskQueue },
+          taskQueueType,
         })
       ).pollers || [];
 
-    const r = type => (o, poller) => {
+    const r = (type) => (o, poller) => {
       const i = o[poller.identity] || {};
 
       o[poller.identity] = {
@@ -305,16 +305,16 @@ router.get(
           !i.lastAccessTime || i.lastAccessTime < poller.lastAccessTime
             ? poller.lastAccessTime
             : i.lastAccessTime,
-        taskListTypes: i.taskListTypes
-          ? i.taskListTypes.concat([type])
+        taskQueueTypes: i.taskQueueTypes
+          ? i.taskQueueTypes.concat([type])
           : [type],
       };
 
       return o;
     };
 
-    const activityL = await descTaskList('Activity'),
-      decisionL = await descTaskList('Decision');
+    const activityL = await descTaskQueue('Activity'),
+      decisionL = await descTaskQueue('Decision');
 
     ctx.body = activityL.reduce(
       r('activity'),
@@ -323,6 +323,6 @@ router.get(
   }
 );
 
-router.get('/health', ctx => (ctx.body = 'OK'));
+router.get('/health', (ctx) => (ctx.body = 'OK'));
 
 module.exports = router;
diff --git a/server/test/cadence-frontend-simulator.js b/server/test/cadence-frontend-simulator.js
index 0a59e587..52d38f49 100644
--- a/server/test/cadence-frontend-simulator.js
+++ b/server/test/cadence-frontend-simulator.js
@@ -1,42 +1,41 @@
-const
-  supertest = require('supertest'),
+const supertest = require('supertest'),
   TChannel = require('tchannel'),
   TChannelAsThrift = require('tchannel/as/thrift'),
   Long = require('long'),
-  path = require('path')
+  path = require('path');
 
-var tchanServer, currTest, client, app
+var tchanServer, currTest, client, app;
 
-global.should = require('chai').should()
-global.dateToLong = d => Long.fromValue(Number(new Date(d))).mul(1000000)
+global.should = require('chai').should();
+global.dateToLong = (d) => Long.fromValue(Number(new Date(d))).mul(1000000);
 
 before(function(done) {
-  tchanServer = new TChannel({ serviceName: 'temporal-frontend' })
+  tchanServer = new TChannel({ serviceName: 'temporal-frontend' });
 
-  client = new TChannel()
+  client = new TChannel();
   var temporalChan = client.makeSubChannel({
-    serviceName: 'temporal-frontend'
-  })
+    serviceName: 'temporal-frontend',
+  });
   var tchan = TChannelAsThrift({
     channel: temporalChan,
-    entryPoint: path.join(__dirname, '../idl/cadence.thrift')
-  })
+    entryPoint: path.join(__dirname, '../idl/cadence.thrift'),
+  });
 
   const handler = (ctx, req, head, body, cb) => {
-    var mockName = req.endpoint.replace('WorkflowService::', '')
+    var mockName = req.endpoint.replace('WorkflowService::', '');
     if (!currTest[mockName]) {
-      throw new Error(`unexpected request to ${req.endpoint}`)
+      throw new Error(`unexpected request to ${req.endpoint}`);
     }
 
-    var body = currTest[mockName](body, req)
+    var body = currTest[mockName](body, req);
     if (body instanceof Error) {
-      cb(body)
+      cb(body);
     } else if (body && body.ok === false) {
-      cb(null, body)
+      cb(null, body);
     } else {
-      cb(null, { ok: true, head, body })
+      cb(null, { ok: true, head, body });
     }
-  }
+  };
 
   [
     'ListOpenWorkflowExecutions',
@@ -48,22 +47,26 @@ before(function(done) {
     'SignalWorkflowExecution',
     'ListNamespaces',
     'DescribeNamespace',
-    'DescribeTaskList'
-  ].forEach(endpoint => tchan.register(tchanServer, 'WorkflowService::' + endpoint, {}, handler))
+    'DescribeTaskQueue',
+  ].forEach((endpoint) =>
+    tchan.register(tchanServer, 'WorkflowService::' + endpoint, {}, handler)
+  );
 
-  process.env.CADENCE_TCHANNEL_PEERS = '127.0.0.1:11343'
-  tchanServer.listen(11343, '127.0.0.1', () => done())
+  process.env.CADENCE_TCHANNEL_PEERS = '127.0.0.1:11343';
+  tchanServer.listen(11343, '127.0.0.1', () => done());
 
-  app = require('../').init({ useWebpack: false, logErrors: false }).listen()
-  global.request = supertest.bind(supertest, app)
-})
+  app = require('../')
+    .init({ useWebpack: false, logErrors: false })
+    .listen();
+  global.request = supertest.bind(supertest, app);
+});
 
 after(function() {
-  app.close()
-  tchanServer.close()
-  client.close()
-})
+  app.close();
+  tchanServer.close();
+  client.close();
+});
 
 beforeEach(function() {
-  currTest = this.currentTest
-})
+  currTest = this.currentTest;
+});
diff --git a/server/test/history.test.js b/server/test/history.test.js
index 138d5ff0..caa8e955 100644
--- a/server/test/history.test.js
+++ b/server/test/history.test.js
@@ -1,92 +1,104 @@
 const Long = require('long'),
-
-wfHistoryThrift = [{
-  eventId: new Long(1),
-  timestamp: new Long(800610625, 351737684, false),
-  eventType: 'WorkflowExecutionStarted',
-  workflowExecutionStartedEventAttributes: {
-    attempt: null,
-    workflowType: {
-      name: 'github.com/temporalio/temporal/demo'
+  wfHistoryThrift = [
+    {
+      eventId: new Long(1),
+      timestamp: new Long(800610625, 351737684, false),
+      eventType: 'WorkflowExecutionStarted',
+      workflowExecutionStartedEventAttributes: {
+        attempt: null,
+        workflowType: {
+          name: 'github.com/temporalio/temporal/demo',
+        },
+        taskQueue: {
+          name: 'ci-task-queue',
+          kind: null,
+        },
+        identity: null,
+        input: Buffer.from(
+          JSON.stringify({
+            emails: ['jane@example.com', 'bob@example.com'],
+            includeFooter: true,
+          })
+        ),
+        expirationTimestamp: null,
+        continuedExecutionRunId: null,
+        continuedFailureDetails: null,
+        continuedFailureReason: null,
+        cronSchedule: null,
+        firstDecisionTaskBackoffSeconds: null,
+        firstExecutionRunId: null,
+        header: null,
+        initiator: null,
+        lastCompletionResult: null,
+        memo: null,
+        originalExecutionRunId: null,
+        parentInitiatedEventId: null,
+        parentWorkflowNamespace: null,
+        parentWorkflowExecution: null,
+        prevAutoResetPoints: null,
+        retryPolicy: null,
+        searchAttributes: null,
+        taskStartToCloseTimeoutSeconds: 30,
+        executionStartToCloseTimeoutSeconds: 1080,
+      },
     },
-    taskList: {
-      name: 'ci-task-queue',
-      kind: null
+    {
+      eventId: new Long(2),
+      timestamp: new Long(800610625, 351737684, false),
+      eventType: 'DecisionTaskScheduled',
+      decisionTaskScheduledEventAttributes: {
+        startToCloseTimeoutSeconds: 180,
+        attempt: 1,
+        taskQueue: {
+          name: 'canary-task-queue',
+          kind: null,
+        },
+      },
     },
-    identity: null,
-    input: Buffer.from(JSON.stringify({
-      emails: ['jane@example.com', 'bob@example.com'],
-      includeFooter: true
-    })),
-    expirationTimestamp: null,
-    continuedExecutionRunId: null,
-    continuedFailureDetails: null,
-    continuedFailureReason: null,
-    cronSchedule: null,
-    firstDecisionTaskBackoffSeconds: null,
-    firstExecutionRunId: null,
-    header: null,
-    initiator: null,
-    lastCompletionResult: null,
-    memo: null,
-    originalExecutionRunId: null,
-    parentInitiatedEventId: null,
-    parentWorkflowNamespace: null,
-    parentWorkflowExecution: null,
-    prevAutoResetPoints: null,
-    retryPolicy: null,
-    searchAttributes: null,
-    taskStartToCloseTimeoutSeconds: 30,
-    executionStartToCloseTimeoutSeconds: 1080
-  }
-}, {
-  eventId: new Long(2),
-  timestamp: new Long(800610625, 351737684, false),
-  eventType: 'DecisionTaskScheduled',
-  decisionTaskScheduledEventAttributes: {
-    startToCloseTimeoutSeconds: 180,
-    attempt: 1,
-    taskList: {
-      name: 'canary-task-queue',
-      kind: null
-    }
-  }
-}, {
-  eventId: new Long(3),
-  timestamp: new Long(800610625, 351737688, false),
-  eventType: 'DecisionTaskStarted',
-  decisionTaskStartedEventAttributes: {
-    identity: 'box1@ci-task-queue',
-    requestId: 'fafa095d-b4ca-423a-a812-223e62b5ccf8',
-    scheduledEventId: new Long(2)
-  }
-}],
-
-wfHistoryJson = [{
-  eventId: 1,
-  timestamp: '2017-11-14T23:24:10.351Z',
-  eventType: 'WorkflowExecutionStarted',
-  details: Object.assign({}, wfHistoryThrift[0].workflowExecutionStartedEventAttributes, {
-    input: {
-      emails: ['jane@example.com', 'bob@example.com'],
-      includeFooter: true
-    }
-  })
-}, {
-  eventId: 2,
-  timestamp: '2017-11-14T23:24:10.351Z',
-  eventType: 'DecisionTaskScheduled',
-  details: wfHistoryThrift[1].decisionTaskScheduledEventAttributes
-}, {
-  eventId: 3,
-  timestamp: '2017-11-14T23:24:27.531Z',
-  eventType: 'DecisionTaskStarted',
-  details: {
-    identity: 'box1@ci-task-queue',
-    requestId: 'fafa095d-b4ca-423a-a812-223e62b5ccf8',
-    scheduledEventId: 2,
-  }
-}]
+    {
+      eventId: new Long(3),
+      timestamp: new Long(800610625, 351737688, false),
+      eventType: 'DecisionTaskStarted',
+      decisionTaskStartedEventAttributes: {
+        identity: 'box1@ci-task-queue',
+        requestId: 'fafa095d-b4ca-423a-a812-223e62b5ccf8',
+        scheduledEventId: new Long(2),
+      },
+    },
+  ],
+  wfHistoryJson = [
+    {
+      eventId: 1,
+      timestamp: '2017-11-14T23:24:10.351Z',
+      eventType: 'WorkflowExecutionStarted',
+      details: Object.assign(
+        {},
+        wfHistoryThrift[0].workflowExecutionStartedEventAttributes,
+        {
+          input: {
+            emails: ['jane@example.com', 'bob@example.com'],
+            includeFooter: true,
+          },
+        }
+      ),
+    },
+    {
+      eventId: 2,
+      timestamp: '2017-11-14T23:24:10.351Z',
+      eventType: 'DecisionTaskScheduled',
+      details: wfHistoryThrift[1].decisionTaskScheduledEventAttributes,
+    },
+    {
+      eventId: 3,
+      timestamp: '2017-11-14T23:24:27.531Z',
+      eventType: 'DecisionTaskStarted',
+      details: {
+        identity: 'box1@ci-task-queue',
+        requestId: 'fafa095d-b4ca-423a-a812-223e62b5ccf8',
+        scheduledEventId: 2,
+      },
+    },
+  ];
 
 describe('Workflow History', function() {
   it('should forward the request to the temporal frontend with workflowId and runId', function() {
@@ -96,38 +108,40 @@ describe('Workflow History', function() {
         namespace: 'canary',
         execution: {
           workflowId: 'ci/demo',
-          runId: 'run1'
+          runId: 'run1',
         },
         maximumPageSize: 100,
         nextPageToken: null,
         skipArchival: null,
-        waitForNewEvent: null
-      })
+        waitForNewEvent: null,
+      });
 
       return {
         history: { events: wfHistoryThrift },
-        nextPageToken: new Buffer('page2')
-      }
-    }
+        nextPageToken: new Buffer('page2'),
+      };
+    };
 
     return request()
       .get('/api/namespaces/canary/workflows/ci%2Fdemo/run1/history')
       .expect(200)
-      .expect('Content-Type', /json/)
-  })
+      .expect('Content-Type', /json/);
+  });
 
   it('should forward the nextPageToken', function() {
     this.test.GetWorkflowExecutionHistory = ({ getRequest }) => {
-      getRequest.nextPageToken.toString().should.equal('page2')
+      getRequest.nextPageToken.toString().should.equal('page2');
 
       return {
         history: { events: [] },
         nextPageToken: new Buffer('page3'),
-      }
-    }
+      };
+    };
 
     return request()
-      .get('/api/namespaces/canary/workflows/ci%2Fdemo/run1/history?nextPageToken=cGFnZTI%3D')
+      .get(
+        '/api/namespaces/canary/workflows/ci%2Fdemo/run1/history?nextPageToken=cGFnZTI%3D'
+      )
       .expect(200)
       .expect('Content-Type', /json/)
       .expect({
@@ -135,30 +149,35 @@ describe('Workflow History', function() {
         history: { events: [] },
         nextPageToken: 'cGFnZTM=',
         rawHistory: null,
-      })
-  })
+      });
+  });
 
   it('should support long polling by forwarding the waitForNewEvent flag', function() {
     this.test.GetWorkflowExecutionHistory = ({ getRequest }) => {
-      getRequest.waitForNewEvent.should.be.true
-      return { history: { events: [{ eventId: 1 }] } }
-    }
+      getRequest.waitForNewEvent.should.be.true;
+      return { history: { events: [{ eventId: 1 }] } };
+    };
 
     return request()
-      .get('/api/namespaces/canary/workflows/ci%2Fdemo/run1/history?waitForNewEvent=true')
+      .get(
+        '/api/namespaces/canary/workflows/ci%2Fdemo/run1/history?waitForNewEvent=true'
+      )
       .expect(200)
       .expect('Content-Type', /json/)
-      .then(() =>  request()
-        .get('/api/namespaces/canary/workflows/ci%2Fdemo/run1/history?waitForNewEvent')
-        .expect(200)
-      )
-  })
+      .then(() =>
+        request()
+          .get(
+            '/api/namespaces/canary/workflows/ci%2Fdemo/run1/history?waitForNewEvent'
+          )
+          .expect(200)
+      );
+  });
 
   it('should transform Long numbers to JavaScript numbers, Long dates to ISO date strings, and line-delimited JSON buffers to JSON', function() {
     this.test.GetWorkflowExecutionHistory = ({ getRequest }) => ({
       history: { events: wfHistoryThrift },
       nextPageToken: new Buffer('page2'),
-    })
+    });
 
     return request()
       .get('/api/namespaces/canary/workflows/ci%2Fdemo/run1/history')
@@ -168,44 +187,44 @@ describe('Workflow History', function() {
         history: { events: wfHistoryJson },
         nextPageToken: 'cGFnZTI=',
         rawHistory: null,
-      })
-  })
+      });
+  });
 
   describe('Export', function() {
-    const wfHistoryCliJson = `[{"eventId":1,"timestamp":1510701850351393089,"eventType":"WorkflowExecutionStarted","workflowExecutionStartedEventAttributes":{"workflowType":{"name":"github.com/temporalio/temporal/demo"},"taskList":{"name":"ci-task-queue"},"input":"eyJlbWFpbHMiOlsiamFuZUBleGFtcGxlLmNvbSIsImJvYkBleGFtcGxlLmNvbSJdLCJpbmNsdWRlRm9vdGVyIjp0cnVlfQ==","executionStartToCloseTimeoutSeconds":1080,"taskStartToCloseTimeoutSeconds":30}},{"eventId":2,"timestamp":1510701850351393089,"eventType":"DecisionTaskScheduled","decisionTaskScheduledEventAttributes":{"taskList":{"name":"canary-task-queue"},"startToCloseTimeoutSeconds":180,"attempt":1}},{"eventId":3,"timestamp":1510701867531262273,"eventType":"DecisionTaskStarted","decisionTaskStartedEventAttributes":{"scheduledEventId":2,"identity":"box1@ci-task-queue","requestId":"fafa095d-b4ca-423a-a812-223e62b5ccf8"}}]`
+    const wfHistoryCliJson = `[{"eventId":1,"timestamp":1510701850351393089,"eventType":"WorkflowExecutionStarted","workflowExecutionStartedEventAttributes":{"workflowType":{"name":"github.com/temporalio/temporal/demo"},"taskQueue":{"name":"ci-task-queue"},"input":"eyJlbWFpbHMiOlsiamFuZUBleGFtcGxlLmNvbSIsImJvYkBleGFtcGxlLmNvbSJdLCJpbmNsdWRlRm9vdGVyIjp0cnVlfQ==","executionStartToCloseTimeoutSeconds":1080,"taskStartToCloseTimeoutSeconds":30}},{"eventId":2,"timestamp":1510701850351393089,"eventType":"DecisionTaskScheduled","decisionTaskScheduledEventAttributes":{"taskQueue":{"name":"canary-task-queue"},"startToCloseTimeoutSeconds":180,"attempt":1}},{"eventId":3,"timestamp":1510701867531262273,"eventType":"DecisionTaskStarted","decisionTaskStartedEventAttributes":{"scheduledEventId":2,"identity":"box1@ci-task-queue","requestId":"fafa095d-b4ca-423a-a812-223e62b5ccf8"}}]`;
 
     it('should be able to export history in a format compatible with the CLI', function() {
       this.test.GetWorkflowExecutionHistory = ({ getRequest }) => ({
-        history: { events: wfHistoryThrift }
-      })
+        history: { events: wfHistoryThrift },
+      });
 
       return request()
         .get('/api/namespaces/canary/workflows/ci%2Fdemo/run1/export')
         .expect(200)
-        .expect(wfHistoryCliJson)
-    })
+        .expect(wfHistoryCliJson);
+    });
 
     it('should page through all responses', async function() {
-      var calls = 0
+      var calls = 0;
       this.test.GetWorkflowExecutionHistory = ({ getRequest }) => {
         if (calls > 0) {
-          getRequest.nextPageToken.should.be.ok
+          getRequest.nextPageToken.should.be.ok;
         } else {
-          should.not.exist(getRequest.nextPageToken)
+          should.not.exist(getRequest.nextPageToken);
         }
         var resp = {
-          history: { events: [wfHistoryThrift[calls]] }
-        }
+          history: { events: [wfHistoryThrift[calls]] },
+        };
         if (++calls < wfHistoryThrift.length) {
-          resp.nextPageToken = new Buffer('page' + calls)
+          resp.nextPageToken = new Buffer('page' + calls);
         }
-        return resp
-      }
+        return resp;
+      };
 
       return request()
         .get('/api/namespaces/canary/workflows/ci%2Fdemo/run1/export')
         .expect(200)
-        .expect(wfHistoryCliJson)
-    })
-  })
-})
+        .expect(wfHistoryCliJson);
+    });
+  });
+});
diff --git a/server/test/task-list.test.js b/server/test/task-list.test.js
index 876a930a..54016d95 100644
--- a/server/test/task-list.test.js
+++ b/server/test/task-list.test.js
@@ -1,43 +1,52 @@
-describe('Task List Pollers', function() {
+describe('Task Queue Pollers', function() {
   it('should aggregate decision and activity pollers together by instance', function() {
-    this.test.DescribeTaskList = ({ request }) => {
-      request.namespace.should.equal('canary')
-      request.taskList.name.should.equal('demo-task-list')
+    this.test.DescribeTaskQueue = ({ request }) => {
+      request.namespace.should.equal('canary');
+      request.taskQueue.name.should.equal('demo-task-queue');
 
       return {
-        pollers: request.taskListType === 'Activity' ? [{
-          identity: '100@node1@demo-task-list',
-          lastAccessTime: dateToLong('2018-03-22T20:21:40.000Z')
-        }, {
-          identity: '102@node3@demo-task-list',
-          lastAccessTime: dateToLong('2018-03-22T20:21:32.000Z')
-        }] : [{
-          identity: '100@node1@demo-task-list',
-          lastAccessTime: dateToLong('2018-03-22T20:20:40.000Z')
-        }, {
-          identity: '101@node2@demo-task-list',
-          lastAccessTime: dateToLong('2018-03-22T20:22:05.000Z')
-        }]
-      }
-    }
+        pollers:
+          request.taskQueueType === 'Activity'
+            ? [
+                {
+                  identity: '100@node1@demo-task-queue',
+                  lastAccessTime: dateToLong('2018-03-22T20:21:40.000Z'),
+                },
+                {
+                  identity: '102@node3@demo-task-queue',
+                  lastAccessTime: dateToLong('2018-03-22T20:21:32.000Z'),
+                },
+              ]
+            : [
+                {
+                  identity: '100@node1@demo-task-queue',
+                  lastAccessTime: dateToLong('2018-03-22T20:20:40.000Z'),
+                },
+                {
+                  identity: '101@node2@demo-task-queue',
+                  lastAccessTime: dateToLong('2018-03-22T20:22:05.000Z'),
+                },
+              ],
+      };
+    };
 
     return request()
-      .get('/api/namespaces/canary/task-lists/demo-task-list/pollers')
+      .get('/api/namespaces/canary/task-queues/demo-task-queue/pollers')
       .expect(200)
       .expect('Content-Type', /json/)
       .expect({
-        '100@node1@demo-task-list': {
+        '100@node1@demo-task-queue': {
           lastAccessTime: '2018-03-22T20:21:40.000Z',
-          taskListTypes: ['decision', 'activity']
+          taskQueueTypes: ['decision', 'activity'],
         },
-        '101@node2@demo-task-list': {
+        '101@node2@demo-task-queue': {
           lastAccessTime: '2018-03-22T20:22:05.000Z',
-          taskListTypes: ['decision']
+          taskQueueTypes: ['decision'],
         },
-        '102@node3@demo-task-list': {
+        '102@node3@demo-task-queue': {
           lastAccessTime: '2018-03-22T20:21:32.000Z',
-          taskListTypes: ['activity']
+          taskQueueTypes: ['activity'],
         },
-      })
-  })
-})
\ No newline at end of file
+      });
+  });
+});
diff --git a/server/test/workflow-execution.test.js b/server/test/workflow-execution.test.js
index c25ea857..74632f58 100644
--- a/server/test/workflow-execution.test.js
+++ b/server/test/workflow-execution.test.js
@@ -1,13 +1,13 @@
 describe('Workflow Execution', function() {
-  it('should describe the workflow', async function () {
+  it('should describe the workflow', async function() {
     this.test.DescribeWorkflowExecution = ({ describeRequest }) => {
       return {
         executionConfig: {
-          taskList: { name: 'ci-task-list' },
-          taskStartToCloseTimeoutSeconds: 10
-        }
-      }
-    }
+          taskQueue: { name: 'ci-task-queue' },
+          taskStartToCloseTimeoutSeconds: 10,
+        },
+      };
+    };
 
     return request()
       .get('/api/namespaces/canary/workflows/ci%2Fdemo/run1')
@@ -15,47 +15,47 @@ describe('Workflow Execution', function() {
       .expect('Content-Type', /json/)
       .expect({
         executionConfig: {
-          taskList: {
-            name: 'ci-task-list',
-            kind: null
+          taskQueue: {
+            name: 'ci-task-queue',
+            kind: null,
           },
           taskStartToCloseTimeoutSeconds: 10,
-          executionStartToCloseTimeoutSeconds: null
+          executionStartToCloseTimeoutSeconds: null,
         },
         workflowExecutionInfo: null,
         pendingChildren: null,
-        pendingActivities: null
-      })
-  })
+        pendingActivities: null,
+      });
+  });
 
   it('should terminate a workflow', async function() {
-    let reason
+    let reason;
     this.test.TerminateWorkflowExecution = ({ terminateRequest }) => {
-      terminateRequest.workflowExecution.workflowId.should.equal('ci/demo')
-      terminateRequest.workflowExecution.runId.should.equal('run1')
-      reason = terminateRequest.reason
-      return {}
-    }
+      terminateRequest.workflowExecution.workflowId.should.equal('ci/demo');
+      terminateRequest.workflowExecution.runId.should.equal('run1');
+      reason = terminateRequest.reason;
+      return {};
+    };
 
     return request()
       .post('/api/namespaces/canary/workflows/ci%2Fdemo/run1/terminate')
       .send({ reason: 'example reason' })
       .expect(204)
-      .expect(() => reason.should.equal('example reason'))
-  })
+      .expect(() => reason.should.equal('example reason'));
+  });
 
   it('should signal a workflow without input', async function() {
-    let signal
+    let signal;
     this.test.SignalWorkflowExecution = ({ signalRequest }) => {
-      signalRequest.workflowExecution.workflowId.should.equal('ci/demo')
-      signalRequest.workflowExecution.runId.should.equal('run2')
-      signal = signalRequest.signalName
-      return {}
-    }
+      signalRequest.workflowExecution.workflowId.should.equal('ci/demo');
+      signalRequest.workflowExecution.runId.should.equal('run2');
+      signal = signalRequest.signalName;
+      return {};
+    };
 
     return request()
       .post('/api/namespaces/canary/workflows/ci%2Fdemo/run2/signal/firealarm')
       .expect(204)
-      .expect(() => signal.should.equal('firealarm'))
-  })
-})
+      .expect(() => signal.should.equal('firealarm'));
+  });
+});
diff --git a/temporal-proto b/temporal-proto
index 82cef318..a404bd24 160000
--- a/temporal-proto
+++ b/temporal-proto
@@ -1 +1 @@
-Subproject commit 82cef318721b65b6d1297ef015ba9ed433714524
+Subproject commit a404bd24bd395a026e19b2dcc48832cedd06fa44