diff --git a/src/index.ts b/src/index.ts
index 67cc5c4..f2d74a5 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,14 +1,14 @@
 /// <reference path="../typings/tsd.d.ts" />
 
 /// <reference path="menu/menu.controller.ts" />
-/// <reference path="services/data.service.ts" />
-/// <reference path="services/selectedWord.service.ts" />
+/// <reference path="services/backend.service.ts" />
+/// <reference path="services/webPage.service.ts" />
 
 module tagIt {
 
   angular.module('tagit', [])
-    .service('DataService', DataService)
-    .service('SelectedWordService', SelectedWordService)
+    .service('BackendService', BackendService)
+    .service('WebPageService', WebPageService)
     .controller('MenuCtrl', MenuCtrl);
 
   export function init (callback: () => void) {
diff --git a/src/menu/menu.controller.ts b/src/menu/menu.controller.ts
index 8d3ae90..a61e7f1 100644
--- a/src/menu/menu.controller.ts
+++ b/src/menu/menu.controller.ts
@@ -7,20 +7,20 @@ module tagIt {
 
     selectedWord = "";
     senses : Object[];
-    dataService : DataService;
-    selectedWordService : SelectedWordService;
+    backendService : BackendService;
+    selectedWordService : WebPageService;
     $log : ng.ILogService;
     $scope: ng.IScope;
 
     /* @ngInject */
     constructor ($scope: IVMScope, $log: angular.ILogService,
-      DataService: DataService,
-      SelectedWordService: SelectedWordService) {
+      BackendService: BackendService,
+      WebPageService: WebPageService) {
       $scope.vm = this;
       this.$log = $log;
       this.$scope = $scope;
-      this.dataService = DataService;
-      this.selectedWordService = SelectedWordService;
+      this.backendService = BackendService;
+      this.selectedWordService = WebPageService;
 
       // Wire up clicklistener
       this.selectedWordService.wireUpListener(this.onWordSelected,
@@ -29,15 +29,15 @@ module tagIt {
 
     onTagSelect (sense: ISense) {
       this.selectedWordService.addTagToPage(sense);
-      this.dataService.storeTaggingInformation({});
+      this.backendService.storeTaggingInformation({});
     }
 
     onWordSelected = (newWord : string) => {
       this.selectedWord = newWord;
-      this.dataService.callServer(newWord)
+      this.backendService.callServer(newWord)
         .then((synsets : Object) => {
           this.$log.debug(synsets);
-          this.senses = this.dataService.processSynsets(<ISynset> synsets);
+          this.senses = this.backendService.processSynsets(<ISynset> synsets);
         });
     }
 
@@ -49,7 +49,7 @@ module tagIt {
     }
 
     selectWord (sense : ISense) {
-      this.dataService.storeTaggingInformation({
+      this.backendService.storeTaggingInformation({
         mail: "mail@nilsnh.no",
         sentence: "whole sentence",
         senseid: sense.senseid,
diff --git a/src/services/data.service.ts b/src/services/backend.service.ts
similarity index 96%
rename from src/services/data.service.ts
rename to src/services/backend.service.ts
index 91accfe..fe47fd4 100644
--- a/src/services/data.service.ts
+++ b/src/services/backend.service.ts
@@ -4,7 +4,7 @@
 
 module tagIt {
 
-  export class DataService {
+  export class BackendService {
 
     $http : ng.IHttpService;
     $log : ng.ILogService;
diff --git a/src/services/selectedWord.service.ts b/src/services/webPage.service.ts
similarity index 98%
rename from src/services/selectedWord.service.ts
rename to src/services/webPage.service.ts
index 30b3d84..e5e293e 100644
--- a/src/services/selectedWord.service.ts
+++ b/src/services/webPage.service.ts
@@ -5,7 +5,7 @@ module tagIt {
    * Takes care of figuring out what word
    * is selected.
    */
-  export class SelectedWordService {
+  export class WebPageService {
 
     $log : ng.ILogService;
     currentSelectionRange : any;