diff --git a/app/app.js b/app/app.js
index c15390a..ebb0bea 100755
--- a/app/app.js
+++ b/app/app.js
@@ -1,22 +1,22 @@
 
 /* Declare app level module */
 angular.module('JamStash', ['ngCookies', 'ngRoute', 'ngSanitize',
-    'jamstash.subsonic.ctrl', 'jamstash.archive.ctrl', 'jamstash.player.ctrl', 'jamstash.queue.ctrl'])
+    'jamstash.subsonic.controller', 'jamstash.archive.controller', 'jamstash.player.controller', 'jamstash.queue.controller'])
 
 .config(['$routeProvider',function($routeProvider) {
     'use strict';
 
     $routeProvider
         .when('/index', { redirectTo: '/library' })
-        .when('/settings', { templateUrl: 'settings/settings.html', controller: 'SettingsCtrl' })
-        .when('/queue', { templateUrl: 'queue/queue.html', controller: 'QueueCtrl' })
-        .when('/library', { templateUrl: 'subsonic/subsonic.html', controller: 'SubsonicCtrl' })
-        .when('/library/:artistId', { templateUrl: 'subsonic/subsonic.html', controller: 'SubsonicCtrl', reloadOnSearch: false })
-        .when('/library/:artistId/:albumId', { templateUrl: 'subsonic/subsonic.html', controller: 'SubsonicCtrl', reloadOnSearch: false })
-        .when('/podcasts', { templateUrl: 'podcasts/podcasts.html', controller: 'PodcastCtrl' })
-        .when('/archive', { templateUrl: 'archive/archive.html', controller: 'ArchiveCtrl' })
-        .when('/archive/:artist', { templateUrl: 'archive/archive.html', controller: 'ArchiveCtrl' })
-        .when('/archive/:artist/:album', { templateUrl: 'archive/archive.html', controller: 'ArchiveCtrl' })
+        .when('/settings', { templateUrl: 'settings/settings.html', controller: 'SettingsController' })
+        .when('/queue', { templateUrl: 'queue/queue.html', controller: 'QueueController' })
+        .when('/library', { templateUrl: 'subsonic/subsonic.html', controller: 'SubsonicController' })
+        .when('/library/:artistId', { templateUrl: 'subsonic/subsonic.html', controller: 'SubsonicController', reloadOnSearch: false })
+        .when('/library/:artistId/:albumId', { templateUrl: 'subsonic/subsonic.html', controller: 'SubsonicController', reloadOnSearch: false })
+        .when('/podcasts', { templateUrl: 'podcasts/podcasts.html', controller: 'PodcastController' })
+        .when('/archive', { templateUrl: 'archive/archive.html', controller: 'ArchiveController' })
+        .when('/archive/:artist', { templateUrl: 'archive/archive.html', controller: 'ArchiveController' })
+        .when('/archive/:artist/:album', { templateUrl: 'archive/archive.html', controller: 'ArchiveController' })
         .otherwise({ redirectTo: '/index' });
 }])
 
diff --git a/app/archive/archive.js b/app/archive/archive.js
index fd6592b..fe12d8a 100644
--- a/app/archive/archive.js
+++ b/app/archive/archive.js
@@ -1,11 +1,11 @@
-/**
-* jamstash.archive.ctrl Module
+/**
+* jamstash.archive.controller Module
 *
 * Access Archive.org
 */
-angular.module('jamstash.archive.ctrl', ['jamstash.archive.service'])
+angular.module('jamstash.archive.controller', ['jamstash.archive.service'])
 
-.controller('ArchiveCtrl', ['$scope', '$rootScope', '$location', '$routeParams', '$http', '$timeout', 'utils', 'globals', 'model', 'notifications', 'player', 'archive', 'json',
+.controller('ArchiveController', ['$scope', '$rootScope', '$location', '$routeParams', '$http', '$timeout', 'utils', 'globals', 'model', 'notifications', 'player', 'archive', 'json',
     function($scope, $rootScope, $location, $routeParams, $http, $timeout, utils, globals, model, notifications, player, archive, json){
     'use strict';
 
@@ -179,4 +179,4 @@ angular.module('jamstash.archive.ctrl', ['jamstash.archive.service'])
         $scope.addSavedCollection($routeParams.artist);
     }
     /* End Startup */
-}]);
\ No newline at end of file
+}]);
diff --git a/app/common/main-controller.js b/app/common/main-controller.js
index bf0f52d..0b8c594 100644
--- a/app/common/main-controller.js
+++ b/app/common/main-controller.js
@@ -1,5 +1,5 @@
 angular.module('JamStash')
-.controller('AppCtrl', ['$scope', '$rootScope', '$document', '$window', '$location', '$cookieStore', '$http', 'utils', 'globals', 'model', 'notifications', 'player',
+.controller('AppController', ['$scope', '$rootScope', '$document', '$window', '$location', '$cookieStore', '$http', 'utils', 'globals', 'model', 'notifications', 'player',
     function($scope, $rootScope, $document, $window, $location, $cookieStore, $http, utils, globals, model, notifications, player) {
     'use strict';
 
diff --git a/app/index.html b/app/index.html
index 5877093..25c800f 100755
--- a/app/index.html
+++ b/app/index.html
@@ -21,7 +21,7 @@
     <link href="styles/Mobile.css" rel="stylesheet" type="text/css" data-name="main" />
     <link href="" rel="stylesheet" type="text/css" data-name="theme" />
 </head>
-<body ng-controller="AppCtrl">
+<body ng-controller="AppController">
     <div id="container">
         <div id="header">
             <div id="messages">
@@ -49,7 +49,7 @@
 
             <div class="clear"></div>
         </div><!-- end #content -->
-        <div id="SideBar" ng-controller="QueueCtrl">
+        <div id="SideBar" ng-controller="QueueController">
             <div class="headeractions">
                 <a class="buttonimg" title="Shuffle Queue" ng-click="queueShuffle()"><img src="images/fork_gd_11x12.png"></a>
                 <a class="buttonimg" id="action_Empty" title="Delete Queue" ng-click="queueEmpty()"><img src="images/trash_fill_gd_12x12.png"></a>
@@ -75,7 +75,7 @@
             -->
         </div>
         <!-- Player -->
-       <jamstash-player ng-controller="PlayerCtrl"></jamstash-player>
+       <jamstash-player ng-controller="PlayerController"></jamstash-player>
     </div> <!-- End container -->
     <script>
         (function (i, s, o, g, r, a, m) {
diff --git a/app/player/player.js b/app/player/player.js
index d6a59e3..9fa0f18 100644
--- a/app/player/player.js
+++ b/app/player/player.js
@@ -3,9 +3,9 @@
 *
 * Control the HTML5 player through jplayer.js
 */
-angular.module('jamstash.player.ctrl', ['jamstash.player.service', 'jamstash.player.directive'])
+angular.module('jamstash.player.controller', ['jamstash.player.service', 'jamstash.player.directive'])
 
-.controller('PlayerCtrl', ['$scope', 'player', function($scope, player){
+.controller('PlayerController', ['$scope', 'player', function($scope, player){
 	'use strict';
 
     $scope.previousTrack = function () {
diff --git a/app/player/player_test.js b/app/player/player_test.js
index 2f88542..796930d 100644
--- a/app/player/player_test.js
+++ b/app/player/player_test.js
@@ -4,7 +4,7 @@ describe("Player controller", function() {
     var player, scope;
 
     beforeEach(function() {
-        module('jamstash.player.ctrl');
+        module('jamstash.player.controller');
 
         inject(function ($controller, $rootScope, _player_) {
             scope = $rootScope.$new();
@@ -15,7 +15,7 @@ describe("Player controller", function() {
             spyOn(player, "previousTrack").and.stub();
             spyOn(player, "defaultPlay").and.stub();
 
-            $controller('PlayerCtrl', {
+            $controller('PlayerController', {
                 $scope: scope,
                 player: player
             });
diff --git a/app/podcasts/podcasts.js b/app/podcasts/podcasts.js
index 5c9eb7b..0f7dca3 100644
--- a/app/podcasts/podcasts.js
+++ b/app/podcasts/podcasts.js
@@ -1,11 +1,11 @@
-
+
 angular.module('JamStash')
 
-.controller('PodcastCtrl', ['$scope', '$rootScope', function PodcastCtrl($scope, $rootScope) {
+.controller('PodcastController', ['$scope', '$rootScope', function ($scope, $rootScope) {
 	'use strict';
     $rootScope.song = [];
 
     /* Launch on Startup */
     $scope.getPodcasts();
     /* End Startup */
-}]);
\ No newline at end of file
+}]);
diff --git a/app/queue/queue.js b/app/queue/queue.js
index ccc3a6f..47d5456 100644
--- a/app/queue/queue.js
+++ b/app/queue/queue.js
@@ -1,7 +1,7 @@
-angular.module('jamstash.queue.ctrl', ['jamstash.player.service'])
+angular.module('jamstash.queue.controller', ['jamstash.player.service'])
 
-.controller('QueueCtrl', ['$scope', '$rootScope', 'globals', 'player',
-	function QueueCtrl($scope, $rootScope, globals, player) {
+.controller('QueueController', ['$scope', '$rootScope', 'globals', 'player',
+	function ($scope, $rootScope, globals, player) {
 	'use strict';
     $scope.settings = globals.settings;
     $scope.song = $rootScope.queue;
diff --git a/app/queue/queue_test.js b/app/queue/queue_test.js
index 1837b17..fa01bf0 100644
--- a/app/queue/queue_test.js
+++ b/app/queue/queue_test.js
@@ -4,7 +4,7 @@ describe("Queue controller", function() {
     var player, $rootScope, scope, globals;
 
     beforeEach(function() {
-        module('jamstash.queue.ctrl');
+        module('jamstash.queue.controller');
 
         inject(function ($controller, _$rootScope_, _globals_, _player_) {
             $rootScope = _$rootScope_;
@@ -15,7 +15,7 @@ describe("Queue controller", function() {
             // Mock the functions of the services
             spyOn(player, "playSong").and.stub();
 
-            $controller('QueueCtrl', {
+            $controller('QueueController', {
                 $rootScope: $rootScope,
                 $scope: scope,
                 globals: globals,
diff --git a/app/settings/settings.js b/app/settings/settings.js
index 30b7039..997093d 100644
--- a/app/settings/settings.js
+++ b/app/settings/settings.js
@@ -1,11 +1,10 @@
 angular.module('JamStash')
 
-.controller('SettingsCtrl', ['$rootScope', '$scope', '$routeParams', '$location',  '$http', '$q', 'utils', 'globals', 'json', 'notifications', 'player',
-    function ($rootScope, $scope, $routeParams, $location, $http, $q, utils, globals, json, notifications, player) {
+.controller('SettingsController', ['$rootScope', '$scope', '$routeParams', '$location', 'utils', 'globals', 'json', 'notifications', 'player',
+    function ($rootScope, $scope, $routeParams, $location, utils, globals, json, notifications, player) {
     'use strict';
     $rootScope.hideQueue();
     $scope.settings = globals.settings; /* See service.js */
-    $scope.ApiVersion = globals.settings.ApiVersion;
     $scope.Timeouts = [
         { id: 10000, name: 10 },
         { id: 20000, name: 20 },
@@ -28,34 +27,6 @@
             $('#AZIndex').show();
         }
     });
-    $scope.ping = function () {
-        var exception = {reason: 'Error when contacting the Subsonic server.'};
-        var deferred = $q.defer();
-        var httpPromise;
-        httpPromise = $http({
-            method: 'GET',
-            timeout: globals.settings.Timeout,
-            // 2015-1-5: This API call only works with json as of SS v5.0?!?
-            //url: globals.BaseURL() + '/ping.view?' + globals.BaseParams(),
-            url: globals.BaseURL() + '/ping.view?' + globals.BaseJSONParams()
-        });
-        httpPromise.success(function(data, status) {
-            var subsonicResponse = (data['subsonic-response'] !== undefined) ? data['subsonic-response'] : {status: 'failed'};
-            if (subsonicResponse.status === 'ok') {
-                $scope.ApiVersion = subsonicResponse.version;
-                globals.settings.ApiVersion = $scope.ApiVersion;
-                deferred.resolve(data);
-            } else {
-                if(subsonicResponse.status === 'failed' && subsonicResponse.error !== undefined) {
-                    notifications.updateMessage(subsonicResponse.error.message);
-                }
-            }
-        }).error(function(data, status) {
-            exception.httpError = status;
-            deferred.reject(exception);
-        });
-        return deferred.promise;
-    };
     $scope.reset = function () {
         utils.setValue('Settings', null, true);
         $scope.loadSettings();
@@ -92,9 +63,16 @@
         notifications.updateMessage('Settings Updated!', true);
         $scope.loadSettings();
         if (globals.settings.Server !== '' && globals.settings.Username !== '' && globals.settings.Password !== '') {
-            $scope.ping().then(function() {
-                $location.path('/library').replace();
-                $rootScope.showIndex = true;
+            $scope.ping().then(function(data) {
+                if (data["subsonic-response"].status == 'ok') {
+                    globals.settings.ApiVersion = data["subsonic-response"].version;
+                    $location.path('/library').replace();
+                    $rootScope.showIndex = true;
+                } else {
+                    if (typeof data["subsonic-response"].error != 'undefined') {
+                        notifications.updateMessage(data["subsonic-response"].error.message);
+                    }
+                }
             });
         }
     };
diff --git a/app/subsonic/subsonic.js b/app/subsonic/subsonic.js
index 162b213..5d2cc9d 100644
--- a/app/subsonic/subsonic.js
+++ b/app/subsonic/subsonic.js
@@ -1,13 +1,13 @@
 /**
-* jamstash.subsonic.ctrl Module
+* jamstash.subsonic.controller Module
 *
 * Access and use the Subsonic Server. The Controller is in charge of relaying the Service's messages to the user through the
 * notifications.
 */
-angular.module('jamstash.subsonic.ctrl', ['jamstash.subsonic.service', 'jamstash.player.service'])
+angular.module('jamstash.subsonic.controller', ['jamstash.subsonic.service', 'jamstash.player.service'])
 
-.controller('SubsonicCtrl', ['$scope', '$rootScope', '$routeParams', 'utils', 'globals', 'map', 'subsonic', 'notifications', 'player',
-    function SubsonicCtrl($scope, $rootScope, $routeParams, utils, globals, map, subsonic, notifications, player) {
+.controller('SubsonicController', ['$scope', '$rootScope', '$routeParams', 'utils', 'globals', 'map', 'subsonic', 'notifications', 'player',
+    function ($scope, $rootScope, $routeParams, utils, globals, map, subsonic, notifications, player) {
     'use strict';
 
     $scope.settings = globals.settings;
diff --git a/app/subsonic/subsonic_test.js b/app/subsonic/subsonic_test.js
index 277d12f..1c555ee 100644
--- a/app/subsonic/subsonic_test.js
+++ b/app/subsonic/subsonic_test.js
@@ -7,7 +7,7 @@ describe("Subsonic controller", function() {
     beforeEach(function() {
         jasmine.addCustomEqualityTester(angular.equals);
 
-        module('jamstash.subsonic.ctrl');
+        module('jamstash.subsonic.controller');
 
         inject(function ($controller, _$rootScope_, utils, globals, map, _subsonic_, _notifications_, $q, _player_) {
             $rootScope = _$rootScope_;
@@ -26,7 +26,7 @@ describe("Subsonic controller", function() {
             spyOn(player, 'playSong').and.stub();
             $rootScope.queue = [];
 
-            $controller('SubsonicCtrl', {
+            $controller('SubsonicController', {
                 $scope: scope,
                 $rootScope: $rootScope,
                 $routeParams: {},