Refactor rename package org.eclipse.xtext.ui.common.editor.codecompletion to org.eclipse.xtext.ui.common.editor.contentassist

34 files changed, 106 insertions, 105 deletions

diff --git a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarUiConfig.java b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarUiConfig.java
index ffacde7..595f569 100644
--- a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarUiConfig.java
+++ b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarUiConfig.java
@@ -14,10 +14,10 @@ public class GenReferenceGrammarUiConfig extends AbstractServiceRegistrationFact
 
 	public Set<IServiceRegistration> registrations() {
 		return scope(org.eclipse.xtext.reference.IReferenceGrammar.SCOPE)
-			.with(org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider.class, org.eclipse.xtext.reference.ReferenceGrammarGenProposalProvider.class)
+			.with(org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider.class, org.eclipse.xtext.reference.ReferenceGrammarGenProposalProvider.class)
 			.with(org.eclipse.jface.text.contentassist.IContentAssistant.class, org.eclipse.jface.text.contentassist.ContentAssistant.class)
-			.with(org.eclipse.jface.text.contentassist.IContentAssistProcessor.class, org.eclipse.xtext.ui.common.editor.codecompletion.DefaultContentAssistProcessor.class)
-			.with(org.eclipse.xtext.ui.common.editor.codecompletion.ILinkingCandidatesService.class, org.eclipse.xtext.ui.common.editor.codecompletion.impl.DefaultLinkingCandidatesService.class)
+			.with(org.eclipse.jface.text.contentassist.IContentAssistProcessor.class, org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultContentAssistProcessor.class)
+			.with(org.eclipse.xtext.ui.common.editor.contentassist.ILinkingCandidatesService.class, org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultLinkingCandidatesService.class)
 			.registrations();
 	}
 
diff --git a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/ReferenceGrammarGenProposalProvider.java b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/ReferenceGrammarGenProposalProvider.java
index 6fcc47c..da9d864 100644
--- a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/ReferenceGrammarGenProposalProvider.java
+++ b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/ReferenceGrammarGenProposalProvider.java
@@ -10,14 +10,14 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.xtext.Assignment;
 import org.eclipse.xtext.CrossReference;
 import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.common.editor.codecompletion.AbstractProposalProvider;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider;
+import org.eclipse.xtext.ui.common.editor.contentassist.AbstractProposalProvider;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
 
 /**
  * Represents a generated, default implementation of interface {@link IProposalProvider}.
  * 
- * @see org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
  */
 public class ReferenceGrammarGenProposalProvider  extends AbstractProposalProvider {
 	// constants
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl.ui/plugin.xml b/examples/org.eclipse.xtext.example.fowlerdsl.ui/plugin.xml
index 9cd6e7c..9f9041b 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl.ui/plugin.xml
+++ b/examples/org.eclipse.xtext.example.fowlerdsl.ui/plugin.xml
@@ -51,27 +51,27 @@
 	</extension>
 	<extension point="org.eclipse.ui.editors.templates">
 		<contextType name="templatesContextTypeEventsName"
-			class="org.eclipse.xtext.ui.common.editor.codecompletion.impl.XtextTemplateContextType"
+			class="org.eclipse.xtext.ui.common.editor.contentassist.impl.XtextTemplateContextType"
 			id="org.eclipse.xtext.example.fowlerdsl.ui.templates.contextType.events">
 		</contextType>
 		<contextType name="templatesContextTypeActionsName"
-			class="org.eclipse.xtext.ui.common.editor.codecompletion.impl.XtextTemplateContextType"
+			class="org.eclipse.xtext.ui.common.editor.contentassist.impl.XtextTemplateContextType"
 			id="org.eclipse.xtext.example.fowlerdsl.ui.templates.contextType.actions">
 		</contextType>
 		<contextType name="templatesContextTypeStateName"
-			class="org.eclipse.xtext.ui.common.editor.codecompletion.impl.XtextTemplateContextType"
+			class="org.eclipse.xtext.ui.common.editor.contentassist.impl.XtextTemplateContextType"
 			id="org.eclipse.xtext.example.fowlerdsl.ui.templates.contextType.state">
 		</contextType>
 		<contextType name="templatesContextTypeEventName"
-			class="org.eclipse.xtext.ui.common.editor.codecompletion.impl.XtextTemplateContextType"
+			class="org.eclipse.xtext.ui.common.editor.contentassist.impl.XtextTemplateContextType"
 			id="org.eclipse.xtext.example.fowlerdsl.ui.templates.contextType.Event">
 		</contextType>
 		<contextType name="templatesContextTypeCommandName"
-			class="org.eclipse.xtext.ui.common.editor.codecompletion.impl.XtextTemplateContextType"
+			class="org.eclipse.xtext.ui.common.editor.contentassist.impl.XtextTemplateContextType"
 			id="org.eclipse.xtext.example.fowlerdsl.ui.templates.contextType.Command">
 		</contextType>
 		<contextType name="templatesContextTypeTransitionName"
-			class="org.eclipse.xtext.ui.common.editor.codecompletion.impl.XtextTemplateContextType"
+			class="org.eclipse.xtext.ui.common.editor.contentassist.impl.XtextTemplateContextType"
 			id="org.eclipse.xtext.example.fowlerdsl.ui.templates.contextType.Transition">
 		</contextType>
 		<include file="templates/templates.xml" /> 
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/FowlerDslGenProposalProvider.java b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/FowlerDslGenProposalProvider.java
index ff38345..87738bc 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/FowlerDslGenProposalProvider.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/FowlerDslGenProposalProvider.java
@@ -10,14 +10,14 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.xtext.Assignment;
 import org.eclipse.xtext.CrossReference;
 import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.common.editor.codecompletion.AbstractProposalProvider;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider;
+import org.eclipse.xtext.ui.common.editor.contentassist.AbstractProposalProvider;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
 
 /**
  * Represents a generated, default implementation of interface {@link IProposalProvider}.
  * 
- * @see org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
  */
 public class FowlerDslGenProposalProvider  extends AbstractProposalProvider {
 	// constants
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslUiConfig.java b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslUiConfig.java
index 87c764e..423dd5d 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslUiConfig.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslUiConfig.java
@@ -14,10 +14,10 @@ public class GenFowlerDslUiConfig extends AbstractServiceRegistrationFactory {
 
 	public Set<IServiceRegistration> registrations() {
 		return scope(org.eclipse.xtext.example.IFowlerDsl.SCOPE)
-			.with(org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider.class, org.eclipse.xtext.example.FowlerDslGenProposalProvider.class)
+			.with(org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider.class, org.eclipse.xtext.example.FowlerDslGenProposalProvider.class)
 			.with(org.eclipse.jface.text.contentassist.IContentAssistant.class, org.eclipse.jface.text.contentassist.ContentAssistant.class)
-			.with(org.eclipse.jface.text.contentassist.IContentAssistProcessor.class, org.eclipse.xtext.ui.common.editor.codecompletion.DefaultContentAssistProcessor.class)
-			.with(org.eclipse.xtext.ui.common.editor.codecompletion.ILinkingCandidatesService.class, org.eclipse.xtext.ui.common.editor.codecompletion.impl.DefaultLinkingCandidatesService.class)
+			.with(org.eclipse.jface.text.contentassist.IContentAssistProcessor.class, org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultContentAssistProcessor.class)
+			.with(org.eclipse.xtext.ui.common.editor.contentassist.ILinkingCandidatesService.class, org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultLinkingCandidatesService.class)
 			.registrations();
 	}
 
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src/org/eclipse/xtext/example/FowlerDslProposalProvider.java b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src/org/eclipse/xtext/example/FowlerDslProposalProvider.java
index 2fd2394..b04e6f6 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src/org/eclipse/xtext/example/FowlerDslProposalProvider.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src/org/eclipse/xtext/example/FowlerDslProposalProvider.java
@@ -4,7 +4,7 @@ import org.eclipse.jface.text.templates.Template;
 import org.eclipse.jface.text.templates.TemplateContextType;
 import org.eclipse.xtext.Keyword;
 import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
 
 public class FowlerDslProposalProvider extends FowlerDslGenProposalProvider {
 
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src/org/eclipse/xtext/example/FowlerDslUiConfig.java b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src/org/eclipse/xtext/example/FowlerDslUiConfig.java
index f25f3e2..dcb7071 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src/org/eclipse/xtext/example/FowlerDslUiConfig.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src/org/eclipse/xtext/example/FowlerDslUiConfig.java
@@ -15,7 +15,7 @@ public class FowlerDslUiConfig extends org.eclipse.xtext.example.GenFowlerDslUiC
 	public Set<IServiceRegistration> registrations() {
 		Set<IServiceRegistration> registrations = super.registrations();
 		registrations.addAll(scope(org.eclipse.xtext.example.IFowlerDsl.SCOPE).with(
-				org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider.class,
+				org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider.class,
 				org.eclipse.xtext.example.FowlerDslProposalProvider.class, ServiceRegistry.PRIORITY_MAX)
 				.registrations());
 		return registrations;
diff --git a/plugins/org.eclipse.xtext.ui.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.ui.common/META-INF/MANIFEST.MF
index 5106a98..de04aa1 100644
--- a/plugins/org.eclipse.xtext.ui.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xtext.ui.common/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@ Bundle-Version: 0.7.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.xtext.ui.core,
  org.eclipse.xtext.log4j;bundle-version="1.2.15"
-Export-Package: org.eclipse.xtext.ui.common.editor.codecompletion,
- org.eclipse.xtext.ui.common.editor.codecompletion.impl,
+Export-Package: org.eclipse.xtext.ui.common.editor.contentassist,
+ org.eclipse.xtext.ui.common.editor.contentassist.impl,
  org.eclipse.xtext.ui.common.editor.folding,
  org.eclipse.xtext.ui.common.editor.formatting,
  org.eclipse.xtext.ui.common.editor.hover,
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/AbstractLinkingCandidatesService.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/AbstractLinkingCandidatesService.java
index f020321..34d0817 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/AbstractLinkingCandidatesService.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/AbstractLinkingCandidatesService.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.codecompletion;
+package org.eclipse.xtext.ui.common.editor.contentassist;
 
 /**
  * @author Sebastian Zarnekow - Initial contribution and API
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/AbstractProposalProvider.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/AbstractProposalProvider.java
index b2e4779..9a065e8 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/AbstractProposalProvider.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/AbstractProposalProvider.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.codecompletion;
+package org.eclipse.xtext.ui.common.editor.contentassist;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -36,7 +36,7 @@ import org.eclipse.xtext.crossref.IScopedElement;
 import org.eclipse.xtext.parsetree.AbstractNode;
 import org.eclipse.xtext.parsetree.LeafNode;
 import org.eclipse.xtext.service.Inject;
-import org.eclipse.xtext.ui.common.editor.codecompletion.impl.XtextCompletionProposal;
+import org.eclipse.xtext.ui.common.editor.contentassist.impl.XtextCompletionProposal;
 import org.eclipse.xtext.util.Strings;
 
 /**
@@ -62,7 +62,7 @@ public abstract class AbstractProposalProvider implements IProposalProvider {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider#completeKeyword(org.eclipse.xtext.Keyword, org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext)
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#completeKeyword(org.eclipse.xtext.Keyword, org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext)
 	 */
 	public List<? extends ICompletionProposal> completeKeyword(Keyword keyword, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
@@ -75,7 +75,7 @@ public abstract class AbstractProposalProvider implements IProposalProvider {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider#completeRuleCall(org.eclipse.xtext.RuleCall, org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext)
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#completeRuleCall(org.eclipse.xtext.RuleCall, org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext)
 	 */
 	public List<? extends ICompletionProposal> completeRuleCall(RuleCall ruleCall, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
@@ -94,7 +94,7 @@ public abstract class AbstractProposalProvider implements IProposalProvider {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider#getTemplateContextType(org.eclipse.xtext.Keyword, org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext)
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#getTemplateContextType(org.eclipse.xtext.Keyword, org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext)
 	 */
 	public TemplateContextType getTemplateContextType(Keyword keyword, IContentAssistContext contentAssistContext) {
 		return null;
@@ -102,7 +102,7 @@ public abstract class AbstractProposalProvider implements IProposalProvider {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider#getTemplateContextType(org.eclipse.xtext.RuleCall, org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext)
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#getTemplateContextType(org.eclipse.xtext.RuleCall, org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext)
 	 */
 	public TemplateContextType getTemplateContextType(RuleCall ruleCall, IContentAssistContext contentAssistContext) {
 		return null;
@@ -110,7 +110,7 @@ public abstract class AbstractProposalProvider implements IProposalProvider {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider#getTemplates(java.lang.String)
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#getTemplates(java.lang.String)
 	 */
 	public Template[] getTemplates(String contextTypeId) {
 		return new Template[]{};
@@ -118,7 +118,7 @@ public abstract class AbstractProposalProvider implements IProposalProvider {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider#sortAndFilter(java.util.List, org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext)
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#sortAndFilter(java.util.List, org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext)
 	 */
 	public List<? extends ICompletionProposal> sortAndFilter(
 			List<? extends ICompletionProposal> completionProposalList, IContentAssistContext contentAssistContext) {
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/IContentAssistCalculator.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/IContentAssistCalculator.java
index 9a265de..1fe043a 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/IContentAssistCalculator.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/IContentAssistCalculator.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.codecompletion;
+package org.eclipse.xtext.ui.common.editor.contentassist;
 
 import java.util.List;
 
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/IContentAssistContext.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/IContentAssistContext.java
index 1bb6e44..abbfa35 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/IContentAssistContext.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/IContentAssistContext.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.codecompletion;
+package org.eclipse.xtext.ui.common.editor.contentassist;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.parsetree.AbstractNode;
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/ILinkingCandidatesService.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/ILinkingCandidatesService.java
index 76521a5..f0c9807 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/ILinkingCandidatesService.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/ILinkingCandidatesService.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.codecompletion;
+package org.eclipse.xtext.ui.common.editor.contentassist;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/IProposalProvider.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/IProposalProvider.java
index b86423f..75d0551 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/IProposalProvider.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/IProposalProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.xtext.ui.common.editor.codecompletion;
+package org.eclipse.xtext.ui.common.editor.contentassist;
 
 import java.util.List;
 
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/ITemplateContentAssistProcessor.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/ITemplateContentAssistProcessor.java
index 0dd0605..f1f38c7 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/ITemplateContentAssistProcessor.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/ITemplateContentAssistProcessor.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  *******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.codecompletion;
+package org.eclipse.xtext.ui.common.editor.contentassist;
 
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.text.templates.TemplateContextType;
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/DefaultContentAssistCalculator.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistCalculator.java
index 6cc28e8..e8e83a3 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/DefaultContentAssistCalculator.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistCalculator.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  *******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.codecompletion.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -33,8 +33,8 @@ import org.eclipse.xtext.parsetree.LeafNode;
 import org.eclipse.xtext.parsetree.NodeUtil;
 import org.eclipse.xtext.parsetree.ParseTreeUtil;
 import org.eclipse.xtext.service.Inject;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistCalculator;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistCalculator;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
 import org.eclipse.xtext.util.XtextSwitch;
 
 /**
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/DefaultContentAssistContext.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistContext.java
index ac1d29d..f716569 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/DefaultContentAssistContext.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistContext.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.codecompletion.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist.impl;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.text.ITextViewer;
@@ -14,7 +14,7 @@ import org.eclipse.xtext.Keyword;
 import org.eclipse.xtext.parsetree.AbstractNode;
 import org.eclipse.xtext.parsetree.CompositeNode;
 import org.eclipse.xtext.parsetree.LeafNode;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
 import org.eclipse.xtext.ui.core.editor.IXtextSourceViewer;
 import org.eclipse.xtext.ui.core.editor.model.IXtextDocument;
 
@@ -41,7 +41,7 @@ public class DefaultContentAssistContext implements IContentAssistContext {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext#getDocument()
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext#getDocument()
 	 */
 	public IXtextDocument getDocument() {
 		return this.xtextDocument;
@@ -49,7 +49,7 @@ public class DefaultContentAssistContext implements IContentAssistContext {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext#getMatchString()
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext#getMatchString()
 	 */
 	public String getMatchString() {
 		if (this.matchString == null) {
@@ -60,7 +60,7 @@ public class DefaultContentAssistContext implements IContentAssistContext {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext#getModel()
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext#getModel()
 	 */
 	public EObject getModel() {
 		return this.xtextSourceViewer.getModel(this.offset);
@@ -68,7 +68,7 @@ public class DefaultContentAssistContext implements IContentAssistContext {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext#getReferenceNode()
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext#getReferenceNode()
 	 */
 	public AbstractNode getReferenceNode() {
 		return this.xtextSourceViewer.getReferenceNode(this.offset);
@@ -76,7 +76,7 @@ public class DefaultContentAssistContext implements IContentAssistContext {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext#getNode()
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext#getNode()
 	 */
 	public AbstractNode getNode() {
 		return this.xtextSourceViewer.getNode(this.offset);
@@ -84,7 +84,7 @@ public class DefaultContentAssistContext implements IContentAssistContext {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext#getOffSet()
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext#getOffSet()
 	 */
 	public int getOffSet() {
 		return this.offset;
@@ -92,7 +92,7 @@ public class DefaultContentAssistContext implements IContentAssistContext {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext#getRootNode()
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext#getRootNode()
 	 */
 	public CompositeNode getRootNode() {
 		return this.xtextSourceViewer.getRootNode();
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/DefaultContentAssistProcessor.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistProcessor.java
index f685444..69bb9c3 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/DefaultContentAssistProcessor.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistProcessor.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.codecompletion;
+package org.eclipse.xtext.ui.common.editor.contentassist.impl;
 
 import java.util.Arrays;
 import java.util.List;
@@ -22,10 +22,10 @@ import org.eclipse.xtext.AbstractElement;
 import org.eclipse.xtext.service.IServiceScope;
 import org.eclipse.xtext.service.Inject;
 import org.eclipse.xtext.service.ServiceRegistry;
-import org.eclipse.xtext.ui.common.editor.codecompletion.impl.DefaultContentAssistContext;
-import org.eclipse.xtext.ui.common.editor.codecompletion.impl.DefaultTemplateContentAssistProcessor;
-import org.eclipse.xtext.ui.common.editor.codecompletion.impl.DefaultContentAssistCalculator;
-import org.eclipse.xtext.ui.common.editor.codecompletion.impl.ProposalProviderInvokerSwitch;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistCalculator;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
+import org.eclipse.xtext.ui.common.editor.contentassist.ITemplateContentAssistProcessor;
 
 /**
  * The default implementation of interface {@link IContentAssistProcessor} provided with Xtext.
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/DefaultLinkingCandidatesService.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultLinkingCandidatesService.java
index 12ac4cf..ae740fc 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/DefaultLinkingCandidatesService.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultLinkingCandidatesService.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.codecompletion.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist.impl;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
@@ -13,7 +13,7 @@ import org.eclipse.xtext.crossref.IScope;
 import org.eclipse.xtext.crossref.IScopeProvider;
 import org.eclipse.xtext.crossref.IScopedElement;
 import org.eclipse.xtext.service.Inject;
-import org.eclipse.xtext.ui.common.editor.codecompletion.AbstractLinkingCandidatesService;
+import org.eclipse.xtext.ui.common.editor.contentassist.AbstractLinkingCandidatesService;
 
 /**
  * @author Sebastian Zarnekow - Initial contribution and API
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/DefaultTemplateContentAssistProcessor.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultTemplateContentAssistProcessor.java
index 9a42ecb..97402b7 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/DefaultTemplateContentAssistProcessor.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultTemplateContentAssistProcessor.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  *******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.codecompletion.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist.impl;
 
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextViewer;
@@ -19,10 +19,10 @@ import org.eclipse.jface.text.templates.TemplateContextType;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.xtext.IMetamodelAccess;
 import org.eclipse.xtext.service.Inject;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext;
-import org.eclipse.xtext.ui.common.editor.codecompletion.ILinkingCandidatesService;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider;
-import org.eclipse.xtext.ui.common.editor.codecompletion.ITemplateContentAssistProcessor;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.ILinkingCandidatesService;
+import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
+import org.eclipse.xtext.ui.common.editor.contentassist.ITemplateContentAssistProcessor;
 
 /**
  * Provides a default implementation of interface {@link ITemplateContentAssistProcessor}.
@@ -82,7 +82,7 @@ public class DefaultTemplateContentAssistProcessor extends TemplateCompletionPro
 	
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.xtext.ui.common.editor.codecompletion.ITemplateContentAssistProcessor#setContextType(org.eclipse.jface.text.templates.TemplateContextType)
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.ITemplateContentAssistProcessor#setContextType(org.eclipse.jface.text.templates.TemplateContextType)
 	 */
 	public void setContextType(TemplateContextType contextType) {
 		this.contextType = contextType;
@@ -90,7 +90,7 @@ public class DefaultTemplateContentAssistProcessor extends TemplateCompletionPro
 	
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.xtext.ui.common.editor.codecompletion.ITemplateContentAssistProcessor#setContentAssistContext(org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext)
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.ITemplateContentAssistProcessor#setContentAssistContext(org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext)
 	 */
 	public void setContentAssistContext(IContentAssistContext contentAssistContext) {
 		this.contentAssistContext = contentAssistContext;
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/ProposalProviderInvokerSwitch.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/ProposalProviderInvokerSwitch.java
index 643390e..9ac1128 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/ProposalProviderInvokerSwitch.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/ProposalProviderInvokerSwitch.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  *******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.codecompletion.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -30,8 +30,8 @@ import org.eclipse.xtext.Keyword;
 import org.eclipse.xtext.ParserRule;
 import org.eclipse.xtext.RuleCall;
 import org.eclipse.xtext.TypeRef;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
 import org.eclipse.xtext.util.Strings;
 import org.eclipse.xtext.util.XtextSwitch;
 
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/XtextCompletionProposal.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/XtextCompletionProposal.java
index 7bab759..0e87712 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/XtextCompletionProposal.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/XtextCompletionProposal.java
@@ -1,4 +1,4 @@
-package org.eclipse.xtext.ui.common.editor.codecompletion.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist.impl;
 
 import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EObject;
@@ -24,7 +24,7 @@ import org.eclipse.xtext.ParserRule;
 import org.eclipse.xtext.RuleCall;
 import org.eclipse.xtext.parsetree.AbstractNode;
 import org.eclipse.xtext.parsetree.LeafNode;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
 
 /**
  * Default Xtext implementation of interface <code>ICompletionProposal</code>.
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/XtextTemplateContext.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/XtextTemplateContext.java
index 1c6ffa5..9b6b5a6 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/XtextTemplateContext.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/XtextTemplateContext.java
@@ -5,15 +5,15 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.codecompletion.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist.impl;
 
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.Position;
 import org.eclipse.jface.text.templates.DocumentTemplateContext;
 import org.eclipse.jface.text.templates.TemplateContextType;
 import org.eclipse.xtext.IMetamodelAccess;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext;
-import org.eclipse.xtext.ui.common.editor.codecompletion.ILinkingCandidatesService;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.ILinkingCandidatesService;
 
 /**
  * Represents an extended version of class {@link DocumentTemplateContext} to provide additional Xtext related 
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/XtextTemplateContextType.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/XtextTemplateContextType.java
index 1ae6691..15e924f 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/impl/XtextTemplateContextType.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/XtextTemplateContextType.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  *******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.codecompletion.impl;
+package org.eclipse.xtext.ui.common.editor.contentassist.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,7 +21,7 @@ import org.eclipse.jface.text.templates.TemplateVariable;
 import org.eclipse.jface.text.templates.TemplateVariableResolver;
 import org.eclipse.xtext.IMetamodelAccess;
 import org.eclipse.xtext.crossref.IScopedElement;
-import org.eclipse.xtext.ui.common.editor.codecompletion.impl.XtextTemplateContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.impl.XtextTemplateContext;
 
 /**
  * Provides a convenience base type for <code>TemplateContextType's</code> preconfigured with several handy 
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageUiConfig.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageUiConfig.java
index 2aff248..386e8aa 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageUiConfig.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageUiConfig.java
@@ -14,10 +14,10 @@ public class GenXtextGrammarTestLanguageUiConfig extends AbstractServiceRegistra
 
 	public Set<IServiceRegistration> registrations() {
 		return scope(org.eclipse.xtext.IXtextGrammarTestLanguage.SCOPE)
-			.with(org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider.class, org.eclipse.xtext.XtextGrammarTestLanguageGenProposalProvider.class)
+			.with(org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider.class, org.eclipse.xtext.XtextGrammarTestLanguageGenProposalProvider.class)
 			.with(org.eclipse.jface.text.contentassist.IContentAssistant.class, org.eclipse.jface.text.contentassist.ContentAssistant.class)
-			.with(org.eclipse.jface.text.contentassist.IContentAssistProcessor.class, org.eclipse.xtext.ui.common.editor.codecompletion.DefaultContentAssistProcessor.class)
-			.with(org.eclipse.xtext.ui.common.editor.codecompletion.ILinkingCandidatesService.class, org.eclipse.xtext.ui.common.editor.codecompletion.impl.DefaultLinkingCandidatesService.class)
+			.with(org.eclipse.jface.text.contentassist.IContentAssistProcessor.class, org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultContentAssistProcessor.class)
+			.with(org.eclipse.xtext.ui.common.editor.contentassist.ILinkingCandidatesService.class, org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultLinkingCandidatesService.class)
 			.registrations();
 	}
 
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguageGenProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguageGenProposalProvider.java
index c251b3f..e232596 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguageGenProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguageGenProposalProvider.java
@@ -12,14 +12,14 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.xtext.Assignment;
 import org.eclipse.xtext.CrossReference;
 import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.common.editor.codecompletion.AbstractProposalProvider;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.AbstractProposalProvider;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
 
 /**
  * Represents a generated, default implementation of interface {@link IProposalProvider}.
  * 
- * @see org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
  */
 public class XtextGrammarTestLanguageGenProposalProvider  extends AbstractProposalProvider {
 	// constants
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguageGenProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguageGenProposalProvider.java
index 3b7e773..4339492 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguageGenProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguageGenProposalProvider.java
@@ -12,14 +12,14 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.xtext.Assignment;
 import org.eclipse.xtext.CrossReference;
 import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.common.editor.codecompletion.AbstractProposalProvider;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.AbstractProposalProvider;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
 
 /**
  * Represents a generated, default implementation of interface {@link IProposalProvider}.
  * 
- * @see org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
  */
 public class ContentAssistTestLanguageGenProposalProvider  extends AbstractProposalProvider {
 	// constants
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageUiConfig.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageUiConfig.java
index 3f36f29..5934b57 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageUiConfig.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageUiConfig.java
@@ -14,10 +14,10 @@ public class GenContentAssistTestLanguageUiConfig extends AbstractServiceRegistr
 
 	public Set<IServiceRegistration> registrations() {
 		return scope(org.eclipse.xtext.testlanguages.IContentAssistTestLanguage.SCOPE)
-			.with(org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider.class, org.eclipse.xtext.testlanguages.ContentAssistTestLanguageGenProposalProvider.class)
+			.with(org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider.class, org.eclipse.xtext.testlanguages.ContentAssistTestLanguageGenProposalProvider.class)
 			.with(org.eclipse.jface.text.contentassist.IContentAssistant.class, org.eclipse.jface.text.contentassist.ContentAssistant.class)
-			.with(org.eclipse.jface.text.contentassist.IContentAssistProcessor.class, org.eclipse.xtext.ui.common.editor.codecompletion.DefaultContentAssistProcessor.class)
-			.with(org.eclipse.xtext.ui.common.editor.codecompletion.ILinkingCandidatesService.class, org.eclipse.xtext.ui.common.editor.codecompletion.impl.DefaultLinkingCandidatesService.class)
+			.with(org.eclipse.jface.text.contentassist.IContentAssistProcessor.class, org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultContentAssistProcessor.class)
+			.with(org.eclipse.xtext.ui.common.editor.contentassist.ILinkingCandidatesService.class, org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultLinkingCandidatesService.class)
 			.registrations();
 	}
 
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageUiConfig.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageUiConfig.java
index 6ca2048..2df3794 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageUiConfig.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageUiConfig.java
@@ -14,10 +14,10 @@ public class GenReferenceGrammarTestLanguageUiConfig extends AbstractServiceRegi
 
 	public Set<IServiceRegistration> registrations() {
 		return scope(org.eclipse.xtext.testlanguages.IReferenceGrammarTestLanguage.SCOPE)
-			.with(org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider.class, org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageGenProposalProvider.class)
+			.with(org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider.class, org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageGenProposalProvider.class)
 			.with(org.eclipse.jface.text.contentassist.IContentAssistant.class, org.eclipse.jface.text.contentassist.ContentAssistant.class)
-			.with(org.eclipse.jface.text.contentassist.IContentAssistProcessor.class, org.eclipse.xtext.ui.common.editor.codecompletion.DefaultContentAssistProcessor.class)
-			.with(org.eclipse.xtext.ui.common.editor.codecompletion.ILinkingCandidatesService.class, org.eclipse.xtext.ui.common.editor.codecompletion.impl.DefaultLinkingCandidatesService.class)
+			.with(org.eclipse.jface.text.contentassist.IContentAssistProcessor.class, org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultContentAssistProcessor.class)
+			.with(org.eclipse.xtext.ui.common.editor.contentassist.ILinkingCandidatesService.class, org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultLinkingCandidatesService.class)
 			.registrations();
 	}
 
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageUiConfig.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageUiConfig.java
index 4cc6461..393bc9f 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageUiConfig.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageUiConfig.java
@@ -14,10 +14,10 @@ public class GenTreeTestLanguageUiConfig extends AbstractServiceRegistrationFact
 
 	public Set<IServiceRegistration> registrations() {
 		return scope(org.eclipse.xtext.testlanguages.ITreeTestLanguage.SCOPE)
-			.with(org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider.class, org.eclipse.xtext.testlanguages.TreeTestLanguageGenProposalProvider.class)
+			.with(org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider.class, org.eclipse.xtext.testlanguages.TreeTestLanguageGenProposalProvider.class)
 			.with(org.eclipse.jface.text.contentassist.IContentAssistant.class, org.eclipse.jface.text.contentassist.ContentAssistant.class)
-			.with(org.eclipse.jface.text.contentassist.IContentAssistProcessor.class, org.eclipse.xtext.ui.common.editor.codecompletion.DefaultContentAssistProcessor.class)
-			.with(org.eclipse.xtext.ui.common.editor.codecompletion.ILinkingCandidatesService.class, org.eclipse.xtext.ui.common.editor.codecompletion.impl.DefaultLinkingCandidatesService.class)
+			.with(org.eclipse.jface.text.contentassist.IContentAssistProcessor.class, org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultContentAssistProcessor.class)
+			.with(org.eclipse.xtext.ui.common.editor.contentassist.ILinkingCandidatesService.class, org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultLinkingCandidatesService.class)
 			.registrations();
 	}
 
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageGenProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageGenProposalProvider.java
index 6868a90..ee3fd92 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageGenProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguageGenProposalProvider.java
@@ -12,14 +12,14 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.xtext.Assignment;
 import org.eclipse.xtext.CrossReference;
 import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.common.editor.codecompletion.AbstractProposalProvider;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.AbstractProposalProvider;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
 
 /**
  * Represents a generated, default implementation of interface {@link IProposalProvider}.
  * 
- * @see org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
  */
 public class ReferenceGrammarTestLanguageGenProposalProvider  extends AbstractProposalProvider {
 	// constants
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguageGenProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguageGenProposalProvider.java
index b7704da..3edfc3d 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguageGenProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguageGenProposalProvider.java
@@ -12,14 +12,14 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.xtext.Assignment;
 import org.eclipse.xtext.CrossReference;
 import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.common.editor.codecompletion.AbstractProposalProvider;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider;
-import org.eclipse.xtext.ui.common.editor.codecompletion.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.AbstractProposalProvider;
+import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
 
 /**
  * Represents a generated, default implementation of interface {@link IProposalProvider}.
  * 
- * @see org.eclipse.xtext.ui.common.editor.codecompletion.IProposalProvider
+ * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
  */
 public class TreeTestLanguageGenProposalProvider  extends AbstractProposalProvider {
 	// constants
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/codecompletion/ContentAssistProcessorTestBuilder.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/ContentAssistProcessorTestBuilder.java
index cb1d1bc..b5c24bd 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/codecompletion/ContentAssistProcessorTestBuilder.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/ContentAssistProcessorTestBuilder.java
@@ -11,7 +11,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.xtext.ui.common.editor.codecompletion;
+package org.eclipse.xtext.ui.common.editor.contentassist.impl;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/codecompletion/DefaultContentAssistProcessorTest.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistProcessorTest.java
index 646ce99..5545286 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/codecompletion/DefaultContentAssistProcessorTest.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistProcessorTest.java
@@ -11,7 +11,7 @@
  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

  *******************************************************************************/

-package org.eclipse.xtext.ui.common.editor.codecompletion;

+package org.eclipse.xtext.ui.common.editor.contentassist.impl;

 

 import org.eclipse.xtext.XtextGrammarTestLanguageStandaloneSetup;

 import org.eclipse.xtext.XtextGrammarTestLanguageUiConfig;

@@ -20,13 +20,14 @@ import org.eclipse.xtext.testlanguages.ContentAssistTestLanguageUiConfig;
 import org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageStandaloneSetup;

 import org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageUiConfig;

 import org.eclipse.xtext.ui.common.AbstractUiTest;

+import org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultContentAssistProcessor;

 

 

 /**

  * Unit test for class <code>DefaultContentAssistProcessor</code>.

  * 

  * @author Michael Clay - Initial contribution and API

- * @see org.eclipse.xtext.ui.common.editor.codecompletion.DefaultContentAssistProcessor

+ * @see org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultContentAssistProcessor

  */

 public class DefaultContentAssistProcessorTest extends AbstractUiTest 

 {