[Bug 405826] Rename Content Types registry service to "orion.core.contentTypeRegistry"
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/contentTypes.js b/bundles/org.eclipse.orion.client.core/web/orion/contentTypes.js
index 25cfae3..fa867f3 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/contentTypes.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/contentTypes.js
@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*global define */
 define([], function() {
-	var SERVICE_ID = "orion.core.contenttypes"; //$NON-NLS-0$
+	var SERVICE_ID = "orion.core.contentTypeRegistry"; //$NON-NLS-0$
 	var EXTENSION_ID = "orion.core.contenttype"; //$NON-NLS-0$
 	var OLD_EXTENSION_ID = "orion.file.contenttype"; // backwards compatibility //$NON-NLS-0$
 
@@ -57,7 +57,7 @@
 	/**
 	 * @name orion.core.ContentTypeService
 	 * @class A service for querying {@link orion.core.ContentType}s.
-	 * @description A service for querying {@link orion.core.ContentType}s. Clients should request the <code>"orion.core.contenttypes"</code>
+	 * @description A service for querying {@link orion.core.ContentType}s. Clients should request the <code>"orion.core.contentTypeRegistry"</code>
 	 * service from the {@link orion.serviceregistry.ServiceRegistry} rather than instantiate this class directly. This constructor is 
 	 * intended for use only by page initialization code.
 	 * @param {orion.serviceregistry.ServiceRegistry} serviceRegistry The service registry to use for looking up registered content types
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/compare/resourceComparer.js b/bundles/org.eclipse.orion.client.ui/web/orion/compare/resourceComparer.js
index fb315df..3bc86e6 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/compare/resourceComparer.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/compare/resourceComparer.js
@@ -54,7 +54,7 @@
 		
 		_getContentType: function(fileURL){
 			var filename = this._resolveFileName(fileURL);
-			return this.serviceRegistry.getService("orion.core.contenttypes").getFilenameContentType(filename); //$NON-NLS-0$
+			return this.serviceRegistry.getService("orion.core.contentTypeRegistry").getFilenameContentType(filename); //$NON-NLS-0$
 		},
 		
 		_resolveComplexFileURL: function(complexURL) {
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/crawler/searchCrawler.js b/bundles/org.eclipse.orion.client.ui/web/orion/crawler/searchCrawler.js
index 753b702..0605e37 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/crawler/searchCrawler.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/crawler/searchCrawler.js
@@ -48,7 +48,7 @@
 	 * @param {Function} onComplete The callback function on search complete. The array of hit file locations are passed to the callback.
 	 */
 	SearchCrawler.prototype.search = function(onComplete){
-		var contentTypeService = this.registry.getService("orion.core.contenttypes"); //$NON-NLS-0$
+		var contentTypeService = this.registry.getService("orion.core.contentTypeRegistry"); //$NON-NLS-0$
 		this._onSearchComplete = onComplete;
 		this._cancelled = false;
 		this._deferredArray = [];
@@ -106,7 +106,7 @@
 	 */
 	SearchCrawler.prototype.buildSkeleton = function(onBegin, onComplete){
 		this._buildingSkeleton = true;
-		var contentTypeService = this.registry.getService("orion.core.contenttypes"); //$NON-NLS-0$
+		var contentTypeService = this.registry.getService("orion.core.contentTypeRegistry"); //$NON-NLS-0$
 		var that = this;
 		onBegin();
 		contentTypeService.getContentTypes().then(function(ct) {
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/edit/dispatcher.js b/bundles/org.eclipse.orion.client.ui/web/orion/edit/dispatcher.js
index 0ecde67..c48c3fb 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/edit/dispatcher.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/edit/dispatcher.js
@@ -21,7 +21,7 @@
 		this.serviceRegistry = serviceRegistry;
 		this.editor = editor;
 		this.inputManager = inputManager;
-		this.contentTypeService = serviceRegistry.getService("orion.core.contenttypes"); //$NON-NLS-0$
+		this.contentTypeService = serviceRegistry.getService("orion.core.contentTypeRegistry"); //$NON-NLS-0$
 		this.serviceReferences = {};
 
 		var self = this;
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/editorCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/editorCommands.js
index d75d4d2..3a0a7e9 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/editorCommands.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/editorCommands.js
@@ -437,11 +437,11 @@
 				if (contentTypesCache) {
 					return contentTypesCache;
 				}
-				var contentTypeService = serviceRegistry.getService("orion.core.contenttypes"); //$NON-NLS-0$
+				var contentTypeService = serviceRegistry.getService("orion.core.contentTypeRegistry"); //$NON-NLS-0$
 				//TODO Shouldn't really be making service selection decisions at this level. See bug 337740
 				if (!contentTypeService) {
 					contentTypeService = new mContentTypes.ContentTypeService(serviceRegistry);
-					contentTypeService = serviceRegistry.getService("orion.core.contenttypes"); //$NON-NLS-0$
+					contentTypeService = serviceRegistry.getService("orion.core.contentTypeRegistry"); //$NON-NLS-0$
 				}
 				return contentTypeService.getContentTypes().then(function(ct) {
 					contentTypesCache = ct;
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/extensionCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/extensionCommands.js
index 69d295a..94a377f 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/extensionCommands.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/extensionCommands.js
@@ -541,7 +541,7 @@
 		}
 
 		function getContentTypes() {
-			var contentTypes = serviceRegistry.getService("orion.core.contenttypes") || contentTypeRegistry;
+			var contentTypes = serviceRegistry.getService("orion.core.contentTypeRegistry") || contentTypeRegistry;
 			return contentTypesCache || Deferred.when(contentTypes.getContentTypes(), function(ct) { //$NON-NLS-0$
 				contentTypesCache = ct;
 				return contentTypesCache;
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js
index 8eaa220..948b34b 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js
@@ -218,11 +218,11 @@
 			if (contentTypesCache) {
 				return contentTypesCache;
 			}
-			var contentTypeService = serviceRegistry.getService("orion.core.contenttypes"); //$NON-NLS-0$
+			var contentTypeService = serviceRegistry.getService("orion.core.contentTypeRegistry"); //$NON-NLS-0$
 			// TODO Shouldn't really be making service selection decisions at this level. See bug 337740
 			if (!contentTypeService) {
 				contentTypeService = new mContentTypes.ContentTypeService(serviceRegistry);
-				contentTypeService = serviceRegistry.getService("orion.core.contenttypes"); //$NON-NLS-0$
+				contentTypeService = serviceRegistry.getService("orion.core.contentTypeRegistry"); //$NON-NLS-0$
 			}
 			return contentTypeService.getContentTypes().then(function (ct) {
 				contentTypesCache = ct;
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/globalSearch/advSearchOptContainer.js b/bundles/org.eclipse.orion.client.ui/web/orion/globalSearch/advSearchOptContainer.js
index 70483e3..ec661c1 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/globalSearch/advSearchOptContainer.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/globalSearch/advSearchOptContainer.js
@@ -87,7 +87,7 @@
 
 	AdvSearchOptRenderer.prototype.render = function(parentDiv){
 		this._parentDiv = parentDiv;
-		var contentTypeService = this._serviceRegistry.getService("orion.core.contenttypes"); //$NON-NLS-0$
+		var contentTypeService = this._serviceRegistry.getService("orion.core.contentTypeRegistry"); //$NON-NLS-0$
 		if(!contentTypeService){
 			contentTypeService = new mContentTypes.ContentTypeService(this._serviceRegistry);
 			this.contentTypesCache = contentTypeService.getContentTypes();
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/highlight.js b/bundles/org.eclipse.orion.client.ui/web/orion/highlight.js
index f475e4b..2370869 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/highlight.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/highlight.js
@@ -137,7 +137,7 @@
 				this.styler = null;

 			}

 			var self = this;

-			return createStyler(this.serviceRegistry, this.serviceRegistry.getService("orion.core.contenttypes"), //$NON-NLS-0$

+			return createStyler(this.serviceRegistry, this.serviceRegistry.getService("orion.core.contentTypeRegistry"), //$NON-NLS-0$

 				fileContentType, textView, annotationModel, fileName, allowAsync).then(

 					function(styler) {

 						self.styler = styler;

diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/markOccurrences.js b/bundles/org.eclipse.orion.client.ui/web/orion/markOccurrences.js
index f14ded4..4d8247e 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/markOccurrences.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/markOccurrences.js
@@ -21,7 +21,7 @@
 		/* Looks up applicable references of occurrence service, calls references, calls the editor to show the occurrences. */
 		findOccurrences: function(inputManager, textView) {
 			function getServiceRefs(registry, contentType, title) {
-				var contentTypeService = registry.getService("orion.core.contenttypes"); //$NON-NLS-0$
+				var contentTypeService = registry.getService("orion.core.contentTypeRegistry"); //$NON-NLS-0$
 				function getFilteredServiceRef(registry, sReference, contentType) {
 					var contentTypeIds = sReference.getProperty("contentType"); //$NON-NLS-0$
 					return contentTypeService.isSomeExtensionOf(contentType, contentTypeIds).then(function(result) {
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/navoutliner.js b/bundles/org.eclipse.orion.client.ui/web/orion/navoutliner.js
index 31b0f78..24666a9 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/navoutliner.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/navoutliner.js
@@ -60,7 +60,7 @@
 		this.registry = serviceRegistry;
 		this.renderer = new NavOutlineRenderer({checkbox: false}, this);
 		this.renderer.commandService = commandService;
-		this.renderer.contentTypeService = serviceRegistry.getService("orion.core.contenttypes");
+		this.renderer.contentTypeService = serviceRegistry.getService("orion.core.contentTypeRegistry");
 	}
 	NavOutlineExplorer.prototype = mExplorer.Explorer.prototype;	
 	NavOutlineExplorer.prototype.constructor = NavOutlineExplorer;
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/syntaxchecker.js b/bundles/org.eclipse.orion.client.ui/web/orion/syntaxchecker.js
index cc533c5..bb6e19c 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/syntaxchecker.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/syntaxchecker.js
@@ -32,7 +32,7 @@
 		 */
 		checkSyntax: function (contentType, title, message, contents) {
 			function getValidators(registry, contentType) {
-				var contentTypeService = registry.getService("orion.core.contenttypes"); //$NON-NLS-0$
+				var contentTypeService = registry.getService("orion.core.contentTypeRegistry"); //$NON-NLS-0$
 				function getFilteredValidator(registry, validator, contentType) {
 					var contentTypeIds = validator.getProperty("contentType"); //$NON-NLS-0$
 					return contentTypeService.isSomeExtensionOf(contentType, contentTypeIds).then(function(result) {
diff --git a/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.js b/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.js
index 8469e8e..02fd921 100644
--- a/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.js
+++ b/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.js
@@ -1118,7 +1118,7 @@
 

 		/* initialize the editors cache (used by some of the built-in commands */

 		contentTypeService = new mContentTypes.ContentTypeService(serviceRegistry);

-		serviceRegistry.getService("orion.core.contenttypes").getContentTypes().then(function(contentTypes) { //$NON-NLS-0$

+		serviceRegistry.getService("orion.core.contentTypeRegistry").getContentTypes().then(function(contentTypes) { //$NON-NLS-0$

 			var commands = mExtensionCommands._createOpenWithCommands(serviceRegistry, contentTypes);

 			var fn = function(command) {

 				openWithCommands.push(command);