diff --git a/accessible/workspace-tree.component.js b/accessible/workspace-block.component.js
similarity index 91%
rename from accessible/workspace-tree.component.js
rename to accessible/workspace-block.component.js
index 67fa04a90..7c8041d9d 100644
--- a/accessible/workspace-tree.component.js
+++ b/accessible/workspace-block.component.js
@@ -24,8 +24,8 @@
  * @author madeeha@google.com (Madeeha Ghori)
  */
 
-blocklyApp.WorkspaceTreeComponent = ng.core.Component({
-  selector: 'blockly-workspace-tree',
+blocklyApp.WorkspaceBlockComponent = ng.core.Component({
+  selector: 'blockly-workspace-block',
   template: `
     <li [id]="idMap['blockRoot']" role="treeitem" class="blocklyHasChildren"
         [attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['blockSummary'], 'blockly-translate-workspace-block')"
@@ -44,10 +44,10 @@ blocklyApp.WorkspaceTreeComponent = ng.core.Component({
             </blockly-field-segment>
           </li>
 
-          <blockly-workspace-tree *ngIf="blockInput.connection && blockInput.connection.targetBlock()"
-                                  [block]="blockInput.connection.targetBlock()" [level]="level + 1"
-                                  [tree]="tree">
-          </blockly-workspace-tree>
+          <blockly-workspace-block *ngIf="blockInput.connection && blockInput.connection.targetBlock()"
+                                   [block]="blockInput.connection.targetBlock()" [level]="level + 1"
+                                   [tree]="tree">
+          </blockly-workspace-block>
           <li #inputList [id]="idMap['inputList' + i]" role="treeitem"
               *ngIf="blockInput.connection && !blockInput.connection.targetBlock()"
               [attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['inputMenuLabel' + i], 'blockly-submenu-indicator')"
@@ -65,13 +65,13 @@ blocklyApp.WorkspaceTreeComponent = ng.core.Component({
       </ol>
     </li>
 
-    <blockly-workspace-tree *ngIf= "block.nextConnection && block.nextConnection.targetBlock()"
-                            [block]="block.nextConnection.targetBlock()"
-                            [level]="level" [tree]="tree">
-    </blockly-workspace-tree>
+    <blockly-workspace-block *ngIf= "block.nextConnection && block.nextConnection.targetBlock()"
+                             [block]="block.nextConnection.targetBlock()"
+                             [level]="level" [tree]="tree">
+    </blockly-workspace-block>
   `,
   directives: [blocklyApp.FieldSegmentComponent, ng.core.forwardRef(function() {
-    return blocklyApp.WorkspaceTreeComponent;
+    return blocklyApp.WorkspaceBlockComponent;
   })],
   inputs: ['block', 'level', 'tree', 'isTopLevel'],
   pipes: [blocklyApp.TranslatePipe]
diff --git a/accessible/workspace.component.js b/accessible/workspace.component.js
index eae4491ed..ae0b1748c 100644
--- a/accessible/workspace.component.js
+++ b/accessible/workspace.component.js
@@ -37,8 +37,8 @@ blocklyApp.WorkspaceComponent = ng.core.Component({
             [attr.aria-labelledby]="workspaceTitle.id"
             (keydown)="onKeypress($event, tree)"
             (focus)="speakLocation(i)">
-          <blockly-workspace-tree [level]="0" [block]="block" [tree]="tree" [isTopLevel]="true">
-          </blockly-workspace-tree>
+          <blockly-workspace-block [level]="0" [block]="block" [tree]="tree" [isTopLevel]="true">
+          </blockly-workspace-block>
         </ol>
 
         <span *ngIf="workspace.topBlocks_.length === 0">
@@ -55,7 +55,7 @@ blocklyApp.WorkspaceComponent = ng.core.Component({
       </div>
     </div>
   `,
-  directives: [blocklyApp.WorkspaceTreeComponent],
+  directives: [blocklyApp.WorkspaceBlockComponent],
   pipes: [blocklyApp.TranslatePipe]
 })
 .Class({
diff --git a/demos/accessible/index.html b/demos/accessible/index.html
index 127628d41..9c07986b6 100644
--- a/demos/accessible/index.html
+++ b/demos/accessible/index.html
@@ -32,7 +32,7 @@
   <script src="../../accessible/block-options-modal.component.js"></script>
   <script src="../../accessible/toolbox-modal.component.js"></script>
   <script src="../../accessible/sidebar.component.js"></script>
-  <script src="../../accessible/workspace-tree.component.js"></script>
+  <script src="../../accessible/workspace-block.component.js"></script>
   <script src="../../accessible/workspace.component.js"></script>
   <script src="../../accessible/app.component.js"></script>