diff --git a/res/app/device-list/column-definitions.js b/res/app/device-list/device-column-service.js
similarity index 98%
rename from res/app/device-list/column-definitions.js
rename to res/app/device-list/device-column-service.js
index b5d85fbc..8b887998 100644
--- a/res/app/device-list/column-definitions.js
+++ b/res/app/device-list/device-column-service.js
@@ -1,7 +1,7 @@
 var _ = require('lodash')
 
-// Builders for all possible values
-module.exports = function($filter, gettext) {
+module.exports = function DeviceColumnService($filter, gettext) {
+  // Definitions for all possible values.
   return {
     state: DeviceStatusCell({
       title: gettext('Status')
diff --git a/res/app/device-list/device-list-details-directive.js b/res/app/device-list/device-list-details-directive.js
index 92475196..1a0a3e64 100644
--- a/res/app/device-list/device-list-details-directive.js
+++ b/res/app/device-list/device-list-details-directive.js
@@ -1,10 +1,6 @@
 var patchArray = require('./util/patch-array')
-var columnDefinitions = require('./column-definitions')
 
-module.exports = function DeviceListDetailsDirective(
-  $filter
-, gettext
-) {
+module.exports = function DeviceListDetailsDirective(DeviceColumnService) {
   return {
     restrict: 'E'
   , template: require('./device-list-details.jade')
@@ -24,7 +20,7 @@ module.exports = function DeviceListDetailsDirective(
         , mapping = Object.create(null)
 
       // Import column definitions
-      scope.columnDefinitions = columnDefinitions($filter, gettext)
+      scope.columnDefinitions = DeviceColumnService
 
       // Sorting
       scope.sortBy = function(column, multiple) {
diff --git a/res/app/device-list/device-list-icons-directive.js b/res/app/device-list/device-list-icons-directive.js
index dffe73fc..4270412f 100644
--- a/res/app/device-list/device-list-icons-directive.js
+++ b/res/app/device-list/device-list-icons-directive.js
@@ -1,8 +1,6 @@
-var columnDefinitions = require('./column-definitions')
-
 module.exports = function DeviceListDetailsDirective(
   $filter
-, gettext
+, DeviceColumnService
 ) {
   function DeviceItem() {
     return {
@@ -101,7 +99,7 @@ module.exports = function DeviceListDetailsDirective(
         , builder = DeviceItem()
 
       // Import column definitions
-      scope.columnDefinitions = columnDefinitions($filter, gettext)
+      scope.columnDefinitions = DeviceColumnService
 
       // Sorting
       scope.sortBy = function(column, multiple) {
diff --git a/res/app/device-list/index.js b/res/app/device-list/index.js
index afab2fbc..9a647f2d 100644
--- a/res/app/device-list/index.js
+++ b/res/app/device-list/index.js
@@ -16,6 +16,7 @@ module.exports = angular.module('device-list', [
       })
   }])
   .controller('DeviceListCtrl', require('./device-list-controller'))
+  .service('DeviceColumnService', require('./device-column-service'))
   .directive('deviceListDetails', require('./device-list-details-directive'))
   .directive('deviceListIcons', require('./device-list-icons-directive'))
   .directive('deviceListStats', require('./device-list-stats-directive'))