diff --git a/js/controllers/settingsAutoActions.js b/js/controllers/settingsAutoActions.js
index db7a167..48bc438 100644
--- a/js/controllers/settingsAutoActions.js
+++ b/js/controllers/settingsAutoActions.js
@@ -31,7 +31,7 @@ function ($scope, $interval, BoardService) {
         triggers: [
             {
                 id: 0,
-                trigger: 'Item moves to lane'
+                trigger: 'Item moves to column'
             },
             {
                 id: 1,
diff --git a/partials/board.html b/partials/board.html
index a995f38..1234673 100644
--- a/partials/board.html
+++ b/partials/board.html
@@ -39,16 +39,16 @@
                  data-ng-class="{'collapsed': lane.collapsed}" data-lane-id="{{ lane.id }}"
                  data-context-menu="onContextMenu(lane.id)" data-target="laneMenu">
                 <h3>{{ lane.name }}
-                    <span class="badge" title="Lane Items" data-ng-if="lane.collapsed">
+                    <span class="badge" title="Column Items" data-ng-if="lane.collapsed">
                         {{ lane.ownItem.length || 0 }}
                     </span>
-                    <span class="fa fa-angle-double-down small shrink" title="Collapse Lane"
+                    <span class="fa fa-angle-double-down small shrink" title="Collapse Column"
                           data-ng-click="toggleLane(lane)"></span>
-                    <span class="fa fa-angle-double-up small expand" title="Expand Lane"
+                    <span class="fa fa-angle-double-up small expand" title="Expand Column"
                           data-ng-click="toggleLane(lane)"></span>
                 </h3>
                 <div class="itemContainer">
-                    <div><!-- Needed to fix sortable behavior when there are no items in a lane. --></div>
+                    <div><!-- Needed to fix sortable behavior when there are no items in a column. --></div>
                     <div class="boardItem clearfix" data-ng-class="{'filtered': item.filtered}"
                          data-ng-repeat="item in lane.ownItem | orderBy:'position':false"
                          data-ng-dblclick="openItem(item)"
diff --git a/partials/boardItemModal.html b/partials/boardItemModal.html
index f1c096d..85d6d00 100644
--- a/partials/boardItemModal.html
+++ b/partials/boardItemModal.html
@@ -43,7 +43,7 @@
                     </select>
                 </div>
                 <div class="form-group col-md-4">
-                    <h5>Lane</h5>
+                    <h5>Column</h5>
                     <select class="form-control" data-ng-model="itemFormData.lane"
                             data-ng-disabled="itemFormData.isSaving"
                             data-ng-options="lane.id as lane.name for lane in currentBoard.ownLane | orderBy:'position':false">
diff --git a/partials/boardItemViewModal.html b/partials/boardItemViewModal.html
index ff5830f..8d7abb0 100644
--- a/partials/boardItemViewModal.html
+++ b/partials/boardItemViewModal.html
@@ -25,7 +25,7 @@
                         <p data-ng-if="viewItem.category">Category: <strong>{{ categories[viewItem.category] }}</strong></p>
                     </div>
                     <div class="col-md-4 text-center">
-                        <p>Current Lane: <strong>{{ viewItem.laneName }}</strong></p>
+                        <p>Current Column: <strong>{{ viewItem.laneName }}</strong></p>
                     </div>
                 </div>
                 <div class="view-item-actions">
diff --git a/partials/settingsBoardModal.html b/partials/settingsBoardModal.html
index bd25605..ccec29a 100644
--- a/partials/settingsBoardModal.html
+++ b/partials/settingsBoardModal.html
@@ -17,7 +17,7 @@
                 </div>
                 <div class="form-group half-width" data-ng-class="{ 'has-error': boardFormData.lanesError }">
                     <form role="form" class="form form-inline" data-ng-submit="boardFormData.addLane()">
-                        <h5>Lanes</h5>
+                        <h5>Columns</h5>
                         <ul class="list-group lanes">
                             <li class="list-group-item small" data-ng-class="{ disabled: boardFormData.isSaving }"
                                 data-ng-repeat="lane in boardFormData.lanes | orderBy:'position':false">
@@ -32,7 +32,7 @@
                                 </span>
                             </li>
                         </ul>
-                        <input class="form-control" style="width: 85%;" type="text" placeholder="Lane Name"
+                        <input class="form-control" style="width: 85%;" type="text" placeholder="Column Name"
                                data-ng-model="boardFormData.laneName" data-ng-disabled="boardFormData.isSaving">
                         <button type="submit" id="modalAddLane" class="btn btn-default fa fa-plus"
                                 data-ng-disabled="boardFormData.isSaving"></button>
diff --git a/partials/settingsBoardTable.html b/partials/settingsBoardTable.html
index 6edf8bd..fc1b485 100644
--- a/partials/settingsBoardTable.html
+++ b/partials/settingsBoardTable.html
@@ -4,7 +4,7 @@
         <table class="table table-striped">
             <thead>
                 <tr>
-                    <th>Name</th><th>Lanes</th><th>Categories</th><th>Users</th><th>Actions</th>
+                    <th>Name</th><th>Columns</th><th>Categories</th><th>Users</th><th>Actions</th>
                 </tr>
             </thead>
             <tbody>