Switch to a more consistent naming convention for services and resource loading.

res/app/scripts/controllers/DeviceControlCtrl.js

@@ -1,4 +1,4 @@
-define(['./module'], function(mod) {
+define(['./_module'], function(controllers) {
   function DeviceControlCtrl($scope, $routeParams, deviceService) {
     $scope.device = null
 
@@ -8,10 +8,10 @@ define(['./module'], function(mod) {
       })
   }
 
-  mod.controller('DeviceControlCtrl'
+  controllers.controller('DeviceControlCtrl'
   , [ '$scope'
     , '$routeParams'
-    , 'deviceService'
+    , 'DeviceService'
     , DeviceControlCtrl
     ])
 })

res/app/scripts/controllers/DeviceListCtrl.js

@@ -1,4 +1,4 @@
-define(['./module'], function(mod) {
+define(['./_module'], function(controllers) {
   function DeviceListCtrl($scope, deviceService, groupService) {
     $scope.devices = deviceService.devices
 
@@ -21,10 +21,10 @@ define(['./module'], function(mod) {
     }
   }
 
-  mod.controller('DeviceListCtrl'
+  controllers.controller('DeviceListCtrl'
   , [ '$scope'
-    , 'deviceService'
-    , 'groupService'
+    , 'DeviceService'
+    , 'GroupService'
     , DeviceListCtrl
     ])
 })