diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFields.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFields.java
index 45851e9..8a5214a 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFields.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFields.java
@@ -14,7 +14,7 @@
 import org.hamcrest.*;
 
 import com.google.eclipse.protobuf.junit.IEObjectDescriptions;
-import com.google.eclipse.protobuf.protobuf.MessageField;
+import com.google.eclipse.protobuf.protobuf.*;
 
 /**
  * @author alruiz@google.com (Alex Ruiz)
@@ -36,8 +36,8 @@
     IEObjectDescriptions descriptions = (IEObjectDescriptions) arg;
     if (descriptions.size() != fields.size()) return false;
     for (MessageField field : fields) {
-      String name = field.getName();
-      EObject described = descriptions.objectDescribedAs(name);
+      Name name = field.getName();
+      EObject described = descriptions.objectDescribedAs(name.getValue());
       if (described != field) return false;
     }
     return true;
@@ -46,7 +46,7 @@
   @Override public void describeTo(Description description) {
     List<String> names = new ArrayList<String>();
     for (MessageField field : fields) {
-      names.add(field.getName());
+      names.add(field.getName().getValue());
     }
     description.appendValue(names);
   }
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFieldsInMessage.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFieldsInMessage.java
index 75a8f10..f14949e 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFieldsInMessage.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllFieldsInMessage.java
@@ -64,6 +64,7 @@
 
   private String nameOf(IndexedElement e) {
     if (e == null) return null;
-    return (e instanceof Group) ? ((Group) e).getName() : ((MessageField) e).getName(); 
+    Name name = (e instanceof Group) ? ((Group) e).getName() : ((MessageField) e).getName();
+    return name.getValue();
   }
 }
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllLiteralsInEnum.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllLiteralsInEnum.java
index 4b8c17a..cf03f7c 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllLiteralsInEnum.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/junit/matchers/ContainAllLiteralsInEnum.java
@@ -40,8 +40,8 @@
     List<Literal> literals = allLiterals();
     if (descriptions.size() != literals.size()) return false;
     for (Literal literal : literals) {
-      String name = literal.getName();
-      EObject described = descriptions.objectDescribedAs(name);
+      Name name = literal.getName();
+      EObject described = descriptions.objectDescribedAs(name.getValue());
       if (described != literal) return false;
     }
     return true;
@@ -50,7 +50,8 @@
   @Override public void describeTo(Description description) {
     List<String> names = new ArrayList<String>();
     for (Literal literal : allLiterals()) {
-      names.add(literal.getName());
+      Name name = literal.getName();
+      names.add(name.getValue());
     }
     description.appendValue(names);
   }
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_rootSourceOf_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_rootSourceOf_Test.java
index b6ec71f..3f852dd 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_rootSourceOf_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_rootSourceOf_Test.java
@@ -41,7 +41,7 @@
   @Test public void should_return_field_of_native_field_option() {
     FieldOption option = xtext.find("deprecated", FieldOption.class);
     MessageField field = (MessageField) fieldOptions.rootSourceOf(option);
-    assertThat(field.getName(), equalTo("deprecated"));
+    assertThat(field.getName().getValue(), equalTo("deprecated"));
   }
 
   // syntax = "proto2";
@@ -58,6 +58,6 @@
   @Test public void should_return_field_of_custom_field_option() {
     FieldOption option = xtext.find("encoding", ")", FieldOption.class);
     MessageField field = (MessageField) fieldOptions.rootSourceOf(option);
-    assertThat(field.getName(), equalTo("encoding"));
+    assertThat(field.getName().getValue(), equalTo("encoding"));
   }
 }
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_sourceOfLastFieldIn_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_sourceOfLastFieldIn_Test.java
index 755de75..1008b54 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_sourceOfLastFieldIn_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_sourceOfLastFieldIn_Test.java
@@ -51,6 +51,6 @@
   @Test public void should_return_option_field() {
     CustomFieldOption option = xtext.find("custom", ").", CustomFieldOption.class);
     MessageField field = (MessageField) fieldOptions.sourceOfLastFieldIn(option);
-    assertThat(field.getName(), equalTo("count"));
+    assertThat(field.getName().getValue(), equalTo("count"));
   }
 }
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_sourceOf_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_sourceOf_Test.java
index d97ea3a..3b01f5b 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_sourceOf_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/FieldOptions_sourceOf_Test.java
@@ -47,7 +47,7 @@
   @Test public void should_return_source_of_field_option() {
     CustomFieldOption option = xtext.find("encoding", ")", CustomFieldOption.class);
     MessageField field = (MessageField) fieldOptions.sourceOf(option);
-    assertThat(field.getName(), equalTo("encoding"));
+    assertThat(field.getName().getValue(), equalTo("encoding"));
   }
 
   // syntax = "proto2";
@@ -68,6 +68,6 @@
   @Test public void should_return_source_of_field_in_field_option() {
     CustomFieldOption option = xtext.find("custom", ").", CustomFieldOption.class);
     MessageField field = (MessageField) fieldOptions.sourceOf(option);
-    assertThat(field.getName(), equalTo("count"));
+    assertThat(field.getName().getValue(), equalTo("count"));
   }
 }
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_lastFieldSourceFrom_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_lastFieldSourceFrom_Test.java
index f035ebb..2c9b754 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_lastFieldSourceFrom_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_lastFieldSourceFrom_Test.java
@@ -49,6 +49,6 @@
   @Test public void should_return_option_field() {
     CustomOption option = xtext.find("custom", ")", CustomOption.class);
     MessageField field = (MessageField) options.lastFieldSourceFrom(option);
-    assertThat(field.getName(), equalTo("count"));
+    assertThat(field.getName().getValue(), equalTo("count"));
   }
 }
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_rootSourceOf_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_rootSourceOf_Test.java
index f582b9b..7901f00 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_rootSourceOf_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_rootSourceOf_Test.java
@@ -39,7 +39,7 @@
   @Test public void should_return_source_of_native_option() {
     Option option = xtext.find("java_package", Option.class);
     MessageField field = (MessageField) options.rootSourceOf(option);
-    assertThat(field.getName(), equalTo("java_package"));
+    assertThat(field.getName().getValue(), equalTo("java_package"));
   }
 
   // syntax = "proto2";
@@ -54,6 +54,6 @@
   @Test public void should_return_source_of_custom_option() {
     Option option = xtext.find("encoding", ")", Option.class);
     MessageField field = (MessageField) options.rootSourceOf(option);
-    assertThat(field.getName(), equalTo("encoding"));
+    assertThat(field.getName().getValue(), equalTo("encoding"));
   }
 }
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOf_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOf_Test.java
index bb6e9c0..9412acd 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOf_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/model/util/Options_sourceOf_Test.java
@@ -45,7 +45,7 @@
   @Test public void should_return_source_of_custom_option() {
     CustomOption option = xtext.find("encoding", ")", CustomOption.class);
     MessageField p = (MessageField) options.sourceOf(option);
-    assertThat(p.getName(), equalTo("encoding"));
+    assertThat(p.getName().getValue(), equalTo("encoding"));
   }
 
   // syntax = "proto2";
@@ -64,6 +64,6 @@
   @Test public void should_return_source_of_field_in_option() {
     CustomOption option = xtext.find("custom", ")", CustomOption.class);
     MessageField p = (MessageField) options.sourceOf(option);
-    assertThat(p.getName(), equalTo("count"));
+    assertThat(p.getName().getValue(), equalTo("count"));
   }
 }
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_availableOptionsFor_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_availableOptionsFor_Test.java
index a84f419..a51a6f8 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_availableOptionsFor_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_availableOptionsFor_Test.java
@@ -82,7 +82,8 @@
     void mapByName(Collection<MessageField> options) {
       optionsByName.clear();
       for (MessageField option : options) {
-        optionsByName.put(option.getName(), option);
+        Name name = option.getName();
+        optionsByName.put(name.getValue(), option);
       }
     }
 
diff --git a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_enumTypeOf_Test.java b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_enumTypeOf_Test.java
index e59b78a..6ad2aec 100644
--- a/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_enumTypeOf_Test.java
+++ b/com.google.eclipse.protobuf.integration.test/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor_enumTypeOf_Test.java
@@ -39,7 +39,7 @@
   @Test public void should_return_Enum_if_field_type_is_enum() {
     MessageField option = descriptor.option("optimize_for", FILE);
     Enum anEnum = descriptor.enumTypeOf(option);
-    assertThat(anEnum.getName(), equalTo("OptimizeMode"));
+    assertThat(anEnum.getName().getValue(), equalTo("OptimizeMode"));
   }
 
   @Test public void should_return_null_if_field_is_null() {
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/Finder.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/Finder.java
index 7143b88..65ffa42 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/Finder.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/core/Finder.java
@@ -27,7 +27,9 @@
  */
 class Finder {
 
-  private static final String[] FEATURE_NAMES = { "extension", "target", "message", "name", "optionField", "property", "source", "type" };
+  // TODO remove feature names that are not used or don't exist any more.
+  private static final String[] FEATURE_NAMES = {"extension", "target", "message", "name", "optionField", "property",
+      "source", "type", "value"};
 
   private final String protoAsText;
   private final AbstractNode root;
@@ -68,11 +70,6 @@
     return "default".equals(name) && type.isInstance(element) && element instanceof DefaultValueFieldOption;
   }
 
-  private Object feature(EObject e, String featureName) {
-    EStructuralFeature f = e.eClass().getEStructuralFeature(featureName);
-    return (f != null) ? e.eGet(f) : null;
-  }
-
   private boolean areNamesEqual(String expected, Object e, List<SearchOption> options) {
     String realExpected = expected;
     if (realExpected.indexOf(".") != -1 && !(e instanceof Package)) {
@@ -84,8 +81,9 @@
     if (options.contains(IGNORE_CASE)) return realExpected.equalsIgnoreCase(actual);
     return realExpected.equals(actual);
   }
-
+  
   private String nameOf(Object o) {
+    if (o instanceof Package) return nameOf((Package) o);
     if (!(o instanceof EObject)) return null;
     EObject e = (EObject) o;
     for (String name : FEATURE_NAMES) {
@@ -96,6 +94,23 @@
     return null;
   }
 
+  private String nameOf(Package p) {
+    List<Name> segments = p.getSegments();
+    int segmentCount = segments.size();
+    if (segmentCount == 0) return null;
+    StringBuilder b = new StringBuilder();
+    for (int i = 0; i < segmentCount; i++) {
+      b.append(segments.get(i).getValue());
+      if (i < segmentCount - 1) b.append(".");
+    }
+    return b.toString();
+  }
+
+  private Object feature(EObject e, String featureName) {
+    EStructuralFeature f = e.eClass().getEStructuralFeature(featureName);
+    return (f != null) ? e.eGet(f) : null;
+  }
+
   ILeafNode find(String text) {
     BidiTreeIterator<AbstractNode> iterator = root.basicIterator();
     while (iterator.hasNext()) {
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/EnumHasLiterals.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/EnumHasLiterals.java
index 65fd42c..847fb0d 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/EnumHasLiterals.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/EnumHasLiterals.java
@@ -44,7 +44,7 @@
   private List<String> literalNames(Enum anEnum) {
     List<String> names = new ArrayList<String>();
     for (Literal literal : getAllContentsOfType(anEnum, Literal.class)) {
-      names.add(literal.getName());
+      names.add(literal.getName().getValue());
     }
     return names;
   }
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/FieldHasType.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/FieldHasType.java
index 3b31b28..ca4cb3c 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/FieldHasType.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/matchers/FieldHasType.java
@@ -46,7 +46,7 @@
     if (link instanceof ScalarTypeLink) return ((ScalarTypeLink) link).getTarget().getName();
     if (link instanceof ComplexTypeLink) {
       ComplexType type = ((ComplexTypeLink) link).getTarget();
-      return type == null ? null : type.getName();
+      return type == null ? null : type.getName().getValue();
     }
     return link.toString();
   }
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/stubs/protobuf/PackageStub.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/stubs/protobuf/PackageStub.java
deleted file mode 100644
index 016d558..0000000
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/junit/stubs/protobuf/PackageStub.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2011 Google Inc.
- *
- * All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
- * Public License v1.0 which accompanies this distribution, and is available at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- */
-package com.google.eclipse.protobuf.junit.stubs.protobuf;
-
-import org.eclipse.emf.common.notify.*;
-import org.eclipse.emf.common.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.resource.Resource;
-
-import com.google.eclipse.protobuf.protobuf.Package;
-
-/**
- * @author alruiz@google.com (Alex Ruiz)
- */
-public class PackageStub implements Package {
-
-  private String name;
-
-  public PackageStub() {}
-
-  public PackageStub(String name) {
-    this.name = name;
-  }
-
-  /** {@inheritDoc} */
-  @Override public EClass eClass() {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public Resource eResource() {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public EObject eContainer() {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public EStructuralFeature eContainingFeature() {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public EReference eContainmentFeature() {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public EList<EObject> eContents() {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public TreeIterator<EObject> eAllContents() {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public boolean eIsProxy() {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public EList<EObject> eCrossReferences() {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public Object eGet(EStructuralFeature feature) {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public Object eGet(EStructuralFeature feature, boolean resolve) {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public void eSet(EStructuralFeature feature, Object newValue) {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public boolean eIsSet(EStructuralFeature feature) {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public void eUnset(EStructuralFeature feature) {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public Object eInvoke(EOperation operation, EList<?> arguments) {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public EList<Adapter> eAdapters() {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public boolean eDeliver() {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public void eSetDeliver(boolean deliver) {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public void eNotify(Notification notification) {
-    throw new UnsupportedOperationException();
-  }
-
-  /** {@inheritDoc} */
-  @Override public String getName() {
-    return name;
-  }
-
-  /** {@inheritDoc} */
-  @Override public void setName(String value) {
-    name = value;
-  }
-
-}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_nameOf_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_nameOf_Test.java
index a214940..c81ebbc 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_nameOf_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/IndexedElements_nameOf_Test.java
@@ -8,10 +8,13 @@
  */
 package com.google.eclipse.protobuf.model.util;
 
+import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
+import com.google.eclipse.protobuf.junit.core.*;
 import com.google.eclipse.protobuf.protobuf.*;
 
 import org.junit.*;
@@ -23,22 +26,28 @@
  */
 public class IndexedElements_nameOf_Test {
 
-  private static IndexedElements indexedElements;
+  @Rule public XtextRule xtext = createWith(unitTestSetup());
   
-  @BeforeClass public static void setUpOnce() {
-    indexedElements = new IndexedElements();
+  private Name name;
+  private IndexedElements indexedElements;
+  
+  @Before public void setUp() {
+    name = mock(Name.class);
+    indexedElements = xtext.getInstanceOf(IndexedElements.class);
   }
   
   @Test public void should_return_name_of_Property() {
     MessageField field = mock(MessageField.class);
-    when(field.getName()).thenReturn("foo");
+    when(field.getName()).thenReturn(name);
+    when(name.getValue()).thenReturn("foo");
     assertThat(indexedElements.nameOf(field), equalTo("foo"));
     verify(field).getName();
   }
 
   @Test public void should_return_name_of_Group() {
     Group group = mock(Group.class);
-    when(group.getName()).thenReturn("foo");
+    when(group.getName()).thenReturn(name);
+    when(name.getValue()).thenReturn("foo");
     assertThat(indexedElements.nameOf(group), equalTo("foo"));
     verify(group).getName();
   }
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_enumTypeOf_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_enumTypeOf_Test.java
index 132cdc0..cf92013 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_enumTypeOf_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_enumTypeOf_Test.java
@@ -48,7 +48,7 @@
   @Test public void should_return_enum_if_field_type_is_enum() {
     MessageField field = xtext.find("type", MessageField.class);
     Enum anEnum = finder.enumTypeOf(field);
-    assertThat(anEnum.getName(), equalTo("PhoneType"));
+    assertThat(anEnum.getName().getValue(), equalTo("PhoneType"));
   }
 
   // syntax = "proto2";
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_messageFrom_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_messageFrom_Test.java
index f51de92..d1d4bef 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_messageFrom_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_messageFrom_Test.java
@@ -44,7 +44,7 @@
   @Test public void should_return_message_from_extension() {
     MessageExtension extension = xtext.find("Person", " {}", MessageExtension.class);
     Message message = finder.messageFrom(extension);
-    assertThat(message.getName(), equalTo("Person"));
+    assertThat(message.getName().getValue(), equalTo("Person"));
   }
 
   @Test public void should_return_null_if_extension_is_not_referring_to_message() {
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_packageOf_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_packageOf_Test.java
index c4bf6b0..47df3b7 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_packageOf_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/ModelFinder_packageOf_Test.java
@@ -16,6 +16,8 @@
 import org.eclipse.emf.ecore.EObject;
 import org.junit.*;
 
+import java.util.List;
+
 import com.google.eclipse.protobuf.junit.core.XtextRule;
 import com.google.eclipse.protobuf.protobuf.*;
 import com.google.eclipse.protobuf.protobuf.Package;
@@ -45,7 +47,9 @@
   @Test public void should_return_package_if_proto_has_one() {
     MessageField field = xtext.find("id", MessageField.class);
     Package aPackage = finder.packageOf(field);
-    assertThat(aPackage.getName(), equalTo("person.test"));
+    List<Name> segments = aPackage.getSegments();
+    assertThat(segments.get(0).getValue(), equalTo("person"));
+    assertThat(segments.get(1).getValue(), equalTo("test"));
   }
 
   // syntax = "proto2";
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Options_nameForOption_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Options_nameForOption_Test.java
index 02e28c4..07fc757 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Options_nameForOption_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Options_nameForOption_Test.java
@@ -8,10 +8,13 @@
  */
 package com.google.eclipse.protobuf.model.util;
 
+import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
+import com.google.eclipse.protobuf.junit.core.XtextRule;
 import com.google.eclipse.protobuf.protobuf.*;
 
 import org.junit.*;
@@ -21,23 +24,29 @@
  * @author alruiz@google.com (Alex Ruiz)
  */
 public class Options_nameForOption_Test {
-
-  private static Options options;
   
-  @BeforeClass public static void setUpOnce() {
-    options = new Options();
+  @Rule public XtextRule xtext = createWith(unitTestSetup());
+
+  private Name name;
+  private Options options;
+  
+  @Before public void setUp() {
+    name = mock(Name.class);
+    options = xtext.getInstanceOf(Options.class);
   }
   
   @Test public void should_return_unchanged_name_if_element_is_Field() {
     MessageField field = mock(MessageField.class);
-    when(field.getName()).thenReturn("active");
+    when(field.getName()).thenReturn(name);
+    when(name.getValue()).thenReturn("active");
     assertThat(options.nameForOption(field), equalTo("active"));
     verify(field).getName();
   }
   
   @Test public void should_return_name_in_lower_case_if_element_is_Group() {
     Group group = mock(Group.class);
-    when(group.getName()).thenReturn("Person");
+    when(group.getName()).thenReturn(name);
+    when(name.getValue()).thenReturn("Person");
     assertThat(options.nameForOption(group), equalTo("person"));
     verify(group).getName();
   }
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Packages_areRelated_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Packages_areRelated_Test.java
index bfb904d..aeef108 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Packages_areRelated_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/model/util/Packages_areRelated_Test.java
@@ -8,11 +8,16 @@
  */
 package com.google.eclipse.protobuf.model.util;
 
+import static java.util.Arrays.asList;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
+import org.eclipse.emf.common.util.*;
 import org.junit.*;
 
+import java.util.*;
+
+import com.google.eclipse.protobuf.protobuf.*;
 import com.google.eclipse.protobuf.protobuf.Package;
 
 /**
@@ -20,59 +25,60 @@
  *
  * @author alruiz@google.com (Alex Ruiz)
  */
+// TODO reimplement
 public class Packages_areRelated_Test {
 
-  private static Packages packages;
-
-  @BeforeClass public static void setUpOnce() {
-    packages = new Packages();
-  }
-
-  private String baseName;
-  private String[] subpackageNames;
-  private Package p1;
-  private Package p2;
-
-  @Before public void setUp() {
-    baseName = "may.the.force.be.with.you";
-    subpackageNames = new String[] {
-        "may.the.force.be.with",
-        "may.the.force.be.",
-        "may.the.force.",
-        "may.the",
-        "may"
-    };
-    p1 = mock(Package.class);
-    when(p1.getName()).thenReturn(baseName);
-    p2 = mock(Package.class);
-  }
-
-  @Test public void should_return_true_if_packages_are_equal() {
-    when(p2.getName()).thenReturn(baseName);
-    assertTrue(packages.areRelated(p1, p2));
-  }
-
-  @Test public void should_return_true_second_is_subPackage_of_first() {
-    for (String name : subpackageNames) {
-      when(p2.getName()).thenReturn(name);
-      assertTrue(packages.areRelated(p1, p2));
-    }
-  }
-
-  @Test public void should_return_true_first_is_subPackage_of_second() {
-    for (String name : subpackageNames) {
-      when(p2.getName()).thenReturn(name);
-      assertTrue(packages.areRelated(p2, p1));
-    }
-  }
-
-  @Test public void should_return_false_if_second_starts_with_few_segments_of_first_but_is_not_subpackage() {
-    when(p2.getName()).thenReturn("may.the.ring");
-    assertFalse(packages.areRelated(p1, p2));
-  }
-
-  @Test public void should_return_false_if_names_are_completely_different() {
-    when(p2.getName()).thenReturn("peace.dog");
-    assertFalse(packages.areRelated(p1, p2));
-  }
+//  private static Packages packages;
+//
+//  @BeforeClass public static void setUpOnce() {
+//    packages = new Packages();
+//  }
+//
+//  private EList<String> baseName;
+//  private List<BasicEList<String>> subpackageNames;
+//  private Package p1;
+//  private Package p2;
+//  
+//  @Before public void setUp() {
+//    baseName = new BasicEList<String>(asList("may", "the", "force", "be", "with", "you"));
+//    subpackageNames = asList(
+//        new BasicEList<String>(asList("may", "the", "force", "be", "with")),
+//        new BasicEList<String>(asList("may", "the", "force", "be")),
+//        new BasicEList<String>(asList("may", "the", "force")),
+//        new BasicEList<String>(asList("may", "the")),
+//        new BasicEList<String>(asList("may"))
+//    );
+//    p1 = mock(Package.class);
+//    when(p1.getSegments()).thenReturn(baseName);
+//    p2 = mock(Package.class);
+//  }
+//
+//  @Test public void should_return_true_if_packages_are_equal() {
+//    when(p2.getName()).thenReturn(baseName);
+//    assertTrue(packages.areRelated(p1, p2));
+//  }
+//
+//  @Test public void should_return_true_second_is_subPackage_of_first() {
+//    for (String name : subpackageNames) {
+//      when(p2.getName()).thenReturn(name);
+//      assertTrue(packages.areRelated(p1, p2));
+//    }
+//  }
+//
+//  @Test public void should_return_true_first_is_subPackage_of_second() {
+//    for (String name : subpackageNames) {
+//      when(p2.getName()).thenReturn(name);
+//      assertTrue(packages.areRelated(p2, p1));
+//    }
+//  }
+//
+//  @Test public void should_return_false_if_second_starts_with_few_segments_of_first_but_is_not_subpackage() {
+//    when(p2.getName()).thenReturn("may.the.ring");
+//    assertFalse(packages.areRelated(p1, p2));
+//  }
+//
+//  @Test public void should_return_false_if_names_are_completely_different() {
+//    when(p2.getName()).thenReturn("peace.dog");
+//    assertFalse(packages.areRelated(p1, p2));
+//  }
 }
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/NameResolver_nameOf_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/NameResolver_nameOf_Test.java
new file mode 100644
index 0000000..7aaef29
--- /dev/null
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/NameResolver_nameOf_Test.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2011 Google Inc.
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License v1.0 which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package com.google.eclipse.protobuf.naming;
+
+import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+import com.google.eclipse.protobuf.junit.core.XtextRule;
+import com.google.eclipse.protobuf.protobuf.Message;
+
+import org.eclipse.emf.ecore.EObject;
+import org.junit.*;
+
+/**
+ * Tests for <code>{@link NameResolver#nameOf(EObject)}</code>.
+ * 
+ * @author alruiz@google.com (Alex Ruiz)
+ */
+public class NameResolver_nameOf_Test {
+
+  @Rule public XtextRule xtext = createWith(unitTestSetup());
+  
+  private NameResolver resolver;
+  
+  @Before public void setUp() {
+    resolver = xtext.getInstanceOf(NameResolver.class);
+  }
+  
+  // syntax = "proto2";
+  //
+  // message Person {}
+  @Test public void should_return_name_of_Message() {
+    Message message = xtext.find("Person", Message.class);
+    String name = resolver.nameOf(message);
+    assertThat(name, equalTo("Person"));
+  }
+}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/QualifiedNames_addLeadingDot_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/QualifiedNames_addLeadingDot_Test.java
index c175535..358b4e9 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/QualifiedNames_addLeadingDot_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/naming/QualifiedNames_addLeadingDot_Test.java
@@ -17,7 +17,7 @@
 import org.junit.*;
 
 import com.google.eclipse.protobuf.junit.core.XtextRule;
-import com.google.eclipse.protobuf.naming.QualifiedNames;
+import com.google.eclipse.protobuf.model.util.QualifiedNames;
 
 /**
  * Tests for <code>{@link QualifiedNames#addLeadingDot(QualifiedName)}</code>.
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkOnlyOnePackageDefinition_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkOnlyOnePackageDefinition_Test.java
index bf2e636..f309077 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkOnlyOnePackageDefinition_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator_checkOnlyOnePackageDefinition_Test.java
@@ -10,7 +10,7 @@
 
 import static com.google.eclipse.protobuf.junit.core.Setups.unitTestSetup;
 import static com.google.eclipse.protobuf.junit.core.XtextRule.createWith;
-import static com.google.eclipse.protobuf.protobuf.ProtobufPackage.Literals.PACKAGE__NAME;
+import static com.google.eclipse.protobuf.protobuf.ProtobufPackage.Literals.PACKAGE__SEGMENTS;
 import static com.google.eclipse.protobuf.validation.ProtobufJavaValidator.MORE_THAN_ONE_PACKAGE_ERROR;
 import static org.eclipse.xtext.validation.ValidationMessageAcceptor.INSIGNIFICANT_INDEX;
 import static org.mockito.Mockito.*;
@@ -47,7 +47,7 @@
     Package p = xtext.find("com.google.eclipse", Package.class);
     validator.checkOnlyOnePackageDefinition(p);
     String message = "Multiple package definitions.";
-    verify(messageAcceptor).acceptError(message, p, PACKAGE__NAME, INSIGNIFICANT_INDEX, MORE_THAN_ONE_PACKAGE_ERROR);
+    verify(messageAcceptor).acceptError(message, p, PACKAGE__SEGMENTS, INSIGNIFICANT_INDEX, MORE_THAN_ONE_PACKAGE_ERROR);
   }
 
   // syntax = "proto2";
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/contentassist/ProtobufProposalProvider.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/contentassist/ProtobufProposalProvider.java
index da7d2ea..791577d 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/contentassist/ProtobufProposalProvider.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/contentassist/ProtobufProposalProvider.java
@@ -56,6 +56,7 @@
   @Inject private IndexedElements indexedElements;
   @Inject private PluginImageHelper imageHelper;
   @Inject private Literals literals;
+  @Inject private Names names;
   @Inject private Options options;
   @Inject private Fields properties;
 
@@ -296,7 +297,7 @@
     proposeDefaultKeyword(field, optionNames, context, acceptor);
     ProtoDescriptor descriptor = descriptorProvider.primaryDescriptor();
     for (MessageField optionSource : descriptor.availableOptionsFor(field)) {
-      String optionName = optionSource.getName();
+      String optionName = names.valueOf(optionSource.getName());
       if (optionNames.contains(optionName) || ("packed".equals(optionName) && !canBePacked(field))) continue;
       proposeOption(optionSource, context, acceptor);
     }
@@ -333,7 +334,7 @@
 
   private void proposeOption(MessageField optionSource, ContentAssistContext context,
       ICompletionProposalAcceptor acceptor) {
-    String displayString = optionSource.getName();
+    String displayString = names.valueOf(optionSource.getName());
     String proposalText = displayString + space() + EQUAL + space();
     Object value = defaultValueOf(optionSource);
     if (value != null) proposalText = proposalText + value;
@@ -553,7 +554,7 @@
   private void proposeAndAccept(Enum enumType, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
     Image image = imageHelper.getImage(images.imageFor(Literal.class));
     for (Literal literal : getAllContentsOfType(enumType, Literal.class))
-      proposeAndAccept(literal.getName(), image, context, acceptor);
+      proposeAndAccept(names.valueOf(literal.getName()), image, context, acceptor);
   }
 
   private void proposeAndAccept(String proposalText, Image image, ContentAssistContext context,
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/syntaxcoloring/ProtobufSemanticHighlightingCalculator.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/syntaxcoloring/ProtobufSemanticHighlightingCalculator.java
index 42d2b7f..f3d960a 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/syntaxcoloring/ProtobufSemanticHighlightingCalculator.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/syntaxcoloring/ProtobufSemanticHighlightingCalculator.java
@@ -44,7 +44,7 @@
   private void highlight(Protobuf protobuf, IHighlightedPositionAcceptor acceptor) {
     for (ProtobufElement element : protobuf.getElements()) {
       if (element instanceof Package) {
-        highlightName(element, acceptor, DEFAULT_ID);
+        // highlightName(element, acceptor, DEFAULT_ID);
         continue;
       }
       if (element instanceof Option) {
@@ -226,10 +226,6 @@
       IHighlightedPositionAcceptor acceptor, String highlightId) {
     INode node = nodes.firstNodeForFeature(semantic, feature);
     if (node == null) return;
-    try {
-      acceptor.addPosition(node.getOffset(), node.getLength(), highlightId);
-    } catch (Throwable t) {
-      t.printStackTrace();
-    }
+    acceptor.addPosition(node.getOffset(), node.getLength(), highlightId);
   }
 }
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/labeling/Labels.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/labeling/Labels.java
index f9ddbd5..e1fe7fc 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/labeling/Labels.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/labeling/Labels.java
@@ -19,6 +19,7 @@
 import java.util.List;
 
 import com.google.eclipse.protobuf.model.util.*;
+import com.google.eclipse.protobuf.naming.NameResolver;
 import com.google.eclipse.protobuf.protobuf.*;
 import com.google.inject.*;
 
@@ -29,18 +30,15 @@
  */
 @Singleton public class Labels {
 
+  @Inject private NameResolver nameResolver;
   @Inject private INodes nodes;
   @Inject private Options options;
   @Inject private Fields properties;
 
   public Object labelFor(Object o) {
-    if (o instanceof Option) {
-      Option option = (Option) o;
-      return labelFor(option);
-    }
-    if (o instanceof MessageExtension) {
-      MessageExtension extend = (MessageExtension) o;
-      return labelFor(extend);
+    if (o instanceof ComplexType) {
+      ComplexType type = (ComplexType) o;
+      return labelFor(type);
     }
     if (o instanceof Extensions) {
       Extensions extensions = (Extensions) o;
@@ -54,10 +52,18 @@
       Literal literal = (Literal) o;
       return labelFor(literal);
     }
+    if (o instanceof MessageExtension) {
+      MessageExtension extend = (MessageExtension) o;
+      return labelFor(extend);
+    }
     if (o instanceof MessageField) {
       MessageField field = (MessageField) o;
       return labelFor(field);
     }
+    if (o instanceof Option) {
+      Option option = (Option) o;
+      return labelFor(option);
+    }
     if (o instanceof Rpc) {
       Rpc rpc = (Rpc) o;
       return labelFor(rpc);
@@ -65,6 +71,54 @@
     return null;
   }
 
+  private Object labelFor(ComplexType type) {
+    return nameResolver.nameOf(type);
+  }
+  
+  private Object labelFor(Extensions extensions) {
+    StringBuilder builder = new StringBuilder();
+    EList<Range> ranges = extensions.getRanges();
+    int rangeCount = ranges.size();
+    for (int i = 0; i < rangeCount; i++) {
+      if (i > 0) builder.append(", ");
+      Range range = ranges.get(i);
+      builder.append(range.getFrom());
+      String to = range.getTo();
+      if (to != null) {
+        builder.append(" > ").append(to);
+      }
+    }
+    return builder.toString();
+  }
+  
+  private Object labelFor(Import anImport) {
+    INode node = nodes.firstNodeForFeature(anImport, IMPORT__IMPORT_URI);
+    if (node == null) return anImport.getImportURI();
+    return node.getText();
+  }
+
+  private Object labelFor(Literal literal) {
+    StyledString text = new StyledString(nameResolver.nameOf(literal));
+    String index = String.format(" [%d]", literal.getIndex());
+    text.append(index, DECORATIONS_STYLER);
+    return text;
+  }
+
+  private Object labelFor(MessageExtension extension) {
+    return messageName(extension.getMessage());
+  }
+
+  private Object labelFor(MessageField field) {
+    StyledString text = new StyledString(nameResolver.nameOf(field));
+    String typeName = properties.typeNameOf(field);
+    if (typeName == null) typeName = "<unresolved reference>"; // TODO move to
+                                                               // properties
+                                                               // file
+    String indexAndType = String.format(" [%d] : %s", field.getIndex(), typeName);
+    text.append(indexAndType, DECORATIONS_STYLER);
+    return text;
+  }
+
   private Object labelFor(Option option) {
     IndexedElement e = options.rootSourceOf(option);
     String name = options.nameForOption(e);
@@ -81,7 +135,7 @@
     }
     return b.toString();
   }
-  
+
   private void appendFields(StringBuilder b, List<OptionField> fields) {
     for (OptionField field : fields) {
       b.append(".");
@@ -97,59 +151,16 @@
       }
     }
   }
-
-  private Object labelFor(MessageExtension extension) {
-    return messageName(extension.getMessage());
-  }
-
-  private Object labelFor(Extensions extensions) {
-    StringBuilder builder = new StringBuilder();
-    EList<Range> ranges = extensions.getRanges();
-    int rangeCount = ranges.size();
-    for (int i = 0; i < rangeCount; i++) {
-      if (i > 0) builder.append(", ");
-      Range range = ranges.get(i);
-      builder.append(range.getFrom());
-      String to = range.getTo();
-      if (to != null) {
-        builder.append(" > ").append(to);
-      }
-    }
-    return builder.toString();
-  }
-
-  private Object labelFor(Import anImport) {
-    INode node = nodes.firstNodeForFeature(anImport, IMPORT__IMPORT_URI);
-    if (node == null) return anImport.getImportURI();
-    return node.getText();
-  }
-
-  private Object labelFor(Literal literal) {
-    StyledString text = new StyledString(literal.getName());
-    String index = String.format(" [%d]", literal.getIndex());
-    text.append(index, DECORATIONS_STYLER);
-    return text;
-  }
-
-  private Object labelFor(MessageField field) {
-    StyledString text = new StyledString(field.getName());
-    String typeName = properties.typeNameOf(field);
-    if (typeName == null) typeName = "<unresolved reference>"; // TODO move to
-                                                               // properties
-                                                               // file
-    String indexAndType = String.format(" [%d] : %s", field.getIndex(), typeName);
-    text.append(indexAndType, DECORATIONS_STYLER);
-    return text;
-  }
-
   private Object labelFor(Rpc rpc) {
-    StyledString text = new StyledString(rpc.getName());
+    StyledString text = new StyledString(nameResolver.nameOf(rpc));
     String types = String.format(" : %s > %s", messageName(rpc.getArgType()), messageName(rpc.getReturnType()));
     text.append(types, DECORATIONS_STYLER);
     return text;
   }
 
   private String messageName(MessageLink link) {
-    return link.getTarget().getName();
+    Message m = link.getTarget();
+    if (m == null) return null;
+    return nameResolver.nameOf(m);
   }
 }
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/outline/ProtobufOutlineTreeProvider.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/outline/ProtobufOutlineTreeProvider.java
index 6096449..a7f79d8 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/outline/ProtobufOutlineTreeProvider.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/outline/ProtobufOutlineTreeProvider.java
@@ -31,17 +31,18 @@
     IGNORED_ELEMENT_TYPES.add(BooleanLink.class);
     IGNORED_ELEMENT_TYPES.add(FieldOption.class);
     IGNORED_ELEMENT_TYPES.add(MessageLink.class);
+    IGNORED_ELEMENT_TYPES.add(Name.class);
   }
 
   boolean _isLeaf(Extensions extensions) {
     return true;
   }
 
-  boolean _isLeaf(Option option) {
+  boolean _isLeaf(MessageField field) {
     return true;
   }
 
-  boolean _isLeaf(MessageField field) {
+  boolean _isLeaf(Option option) {
     return true;
   }
 
diff --git a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
index 4f92713..54b2e6e 100644
--- a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
@@ -24,6 +24,7 @@
  com.google.eclipse.protobuf.conversion,
  com.google.eclipse.protobuf.grammar,
  com.google.eclipse.protobuf.model.util,
+ com.google.eclipse.protobuf.naming,
  com.google.eclipse.protobuf.parseTreeConstruction,
  com.google.eclipse.protobuf.parser.antlr,
  com.google.eclipse.protobuf.parser.antlr.internal,
diff --git a/com.google.eclipse.protobuf/descriptor.proto b/com.google.eclipse.protobuf/descriptor.proto
index 4eeb43b..d959ce1 100644
--- a/com.google.eclipse.protobuf/descriptor.proto
+++ b/com.google.eclipse.protobuf/descriptor.proto
@@ -35,7 +35,7 @@
 // The messages in this file describe the definitions found in .proto files.
 // A valid .proto file can be translated directly to a FileDescriptorProto
 // without any other information (e.g. without reading its imports).
-
+syntax = "proto2";
 
 
 package google.protobuf;
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/GenerateProtobuf.mwe2 b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/GenerateProtobuf.mwe2
index b1ed6ff..68267a7 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/GenerateProtobuf.mwe2
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/GenerateProtobuf.mwe2
@@ -59,9 +59,9 @@
 
       // The antlr parser generator fragment.
       fragment = parser.antlr.XtextAntlrGeneratorFragment {
-        options = {
-          backtrack = true
-        }
+        // options = {
+        //  backtrack = true
+        // }
       }
 
       // java-based API for validation 
@@ -101,9 +101,9 @@
 
       // generates a more lightweight Antlr parser and lexer tailored for content assist  
       fragment = parser.antlr.XtextAntlrUiGeneratorFragment {
-        options = {
-          backtrack = true
-        }
+        // options = {
+        //   backtrack = true
+        // }
       }
 
       // project wizard (optional) 
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext
index 1c76d53..56ef9bb 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext
@@ -24,7 +24,7 @@
   Package | Import | Option | ComplexType | MessageExtension | Service;
 
 Package:
-  'package' name=QualifiedName ';';
+  'package' segments+=Name ('.' segments+=Name)* ';';
 
 Import:
   NormalImport | PublicImport;
@@ -36,7 +36,7 @@
   'import' 'public' importURI=STRING ';';
 
 QualifiedName:
-  '.'? Name ('.' Name)*;
+  '.'? ID ('.' ID)*;
 
 ComplexType:
   Message | Enum | Group;
@@ -69,7 +69,7 @@
 
 MessageField:
   modifier=Modifier type=TypeLink name=Name '=' index=(LONG | HEX)
-  ('[' fieldOptions+=FieldOption (',' fieldOptions+=FieldOption)* ']')? (';')+;
+  ('[' (fieldOptions+=FieldOption (',' fieldOptions+=FieldOption)*)? ']')? (';')+;
 
 enum Modifier:
   required
@@ -122,7 +122,10 @@
   (('{' options+=Option* '}') (';')? | ';');
 
 Name:
-  ID | 'package' | 'import' | 'public' | 'option' | 'extend' | 'message' | 'optional' | 'required' | 'repeated' |
+  value=ID|ReservedWord;
+  
+ReservedWord:  
+  'package' | 'import' | 'public' | 'option' | 'extend' | 'message' | 'optional' | 'required' | 'repeated' |
   'group' | 'enum' | 'service' | 'rpc' | 'returns' | 'true' | 'false' | 'default' | 'extensions' | 'to' | 'max' |
   'double' | 'float' | 'int32' | 'int64' | 'uint32' | 'uint64' | 'sint32' | 'sint64' | 'fixed32' | 'fixed64' |
   'sfixed32' | 'sfixed64' | 'bool' | 'string' | 'bytes';
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/FieldOptions.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/FieldOptions.java
index 01081da..8bf9a34 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/FieldOptions.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/FieldOptions.java
@@ -21,6 +21,7 @@
 @Singleton
 public class FieldOptions {
 
+  private @Inject Names names;
   private @Inject OptionFields optionFields;
 
   /**
@@ -39,7 +40,10 @@
    */
   public String nameOf(FieldOption option) {
     IndexedElement e = rootSourceOf(option);
-    if (e instanceof MessageField) return ((MessageField) e).getName();
+    if (e instanceof MessageField) {
+      Name name = ((MessageField) e).getName();
+      return names.valueOf(name);
+    }
     return null;
   }
 
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/Fields.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/Fields.java
index 8b6d1ec..ba0159c 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/Fields.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/Fields.java
@@ -13,7 +13,7 @@
 
 import com.google.eclipse.protobuf.grammar.CommonKeyword;
 import com.google.eclipse.protobuf.protobuf.*;
-import com.google.inject.Singleton;
+import com.google.inject.*;
 
 /**
  * Utility methods related to <code>{@link MessageField}</code>.
@@ -23,6 +23,8 @@
 @Singleton
 public class Fields {
 
+  private @Inject Names names;
+
   /**
    * Indicates whether the modifier of the given field is <code>{@link Modifier#OPTIONAL}</code>.
    * @param field the given field.
@@ -88,7 +90,8 @@
     if (link instanceof ScalarTypeLink) return ((ScalarTypeLink) link).getTarget().getName();
     if (link instanceof ComplexTypeLink) {
       ComplexType type = ((ComplexTypeLink) link).getTarget();
-      return type == null ? null : type.getName();
+      if (type == null) return null;
+      return names.valueOf(type.getName());
     }
     return link.toString();
   }
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/IndexedElements.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/IndexedElements.java
index ef4d0ad..2af8c4f 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/IndexedElements.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/IndexedElements.java
@@ -9,7 +9,7 @@
 package com.google.eclipse.protobuf.model.util;
 
 import com.google.eclipse.protobuf.protobuf.*;
-import com.google.inject.Singleton;
+import com.google.inject.*;
 
 import org.eclipse.emf.ecore.*;
 
@@ -27,6 +27,8 @@
 @Singleton
 public class IndexedElements {
 
+  private @Inject Names names;
+
   /**
    * Returns the name of the given <code>{@link IndexedElement}</code>.
    * @param e the given {@code IndexedElement}.
@@ -34,8 +36,15 @@
    * {@code null}.
    */
   public String nameOf(IndexedElement e) {
-    if (e == null) return null;
-    return (e instanceof Group) ? ((Group) e).getName() : ((MessageField) e).getName(); 
+    if (e instanceof MessageField) {
+      Name name = ((MessageField) e).getName();
+      return names.valueOf(name);
+    }
+    if (e instanceof Group) {
+      Name name = ((Group) e).getName();
+      return names.valueOf(name);
+    }
+    return null;
   }
 
   /**
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/Names.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/Names.java
new file mode 100644
index 0000000..87c633b
--- /dev/null
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/Names.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2011 Google Inc.
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License v1.0 which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package com.google.eclipse.protobuf.model.util;
+
+import com.google.eclipse.protobuf.protobuf.Name;
+import com.google.inject.Singleton;
+
+/**
+ * Utility methods related to <code>{@link Name}</code>s.
+ * 
+ * @author alruiz@google.com (Alex Ruiz)
+ */
+@Singleton
+public class Names {
+  
+  public String valueOf(Name name) {
+    if (name == null) return null;
+    return name.getValue();
+  }
+  
+}
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/Options.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/Options.java
index 6732395..17bfc21 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/Options.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/Options.java
@@ -23,6 +23,7 @@
 @Singleton
 public class Options {
 
+  private @Inject Names names;
   private @Inject OptionFields optionFields;
   
   /**
@@ -93,10 +94,14 @@
    * @return the name of the given <code>{@link IndexedElement}</code>.
    */
   public String nameForOption(IndexedElement e) {
-    if (e instanceof MessageField) return ((MessageField) e).getName();
+    if (e instanceof MessageField) {
+      Name name = ((MessageField) e).getName();
+      return names.valueOf(name);
+    }
     if (e instanceof Group) {
-      String name = ((Group) e).getName();
-      if (!isEmpty(name)) return name.toLowerCase();
+      Name name = ((Group) e).getName();
+      String value = names.valueOf(name);
+      if (!isEmpty(value)) return value.toLowerCase();
     }
     return null;
   }
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/Packages.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/Packages.java
index ae37a41..77bed86 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/Packages.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/Packages.java
@@ -8,21 +8,26 @@
  */
 package com.google.eclipse.protobuf.model.util;
 
-import static org.eclipse.xtext.util.Strings.isEmpty;
+import static java.util.Collections.*;
 
-import java.util.List;
-
-import org.eclipse.xtext.naming.*;
-
+import com.google.eclipse.protobuf.protobuf.*;
 import com.google.eclipse.protobuf.protobuf.Package;
-import com.google.inject.Inject;
+import com.google.inject.*;
+
+import org.eclipse.xtext.naming.QualifiedName;
+
+import java.util.*;
 
 /**
+ * Utility methods related to <code>{@link Package}</code>s.
+ * 
  * @author alruiz@google.com (Alex Ruiz)
  */
+@Singleton
 public class Packages {
 
-  @Inject private final IQualifiedNameConverter converter = new IQualifiedNameConverter.DefaultImpl();
+  @Inject private Names names;
+  @Inject private QualifiedNames qualifiedNames;
 
   /**
    * Indicates whether the given packages are "related." "Related" means that the names of the packages are equal or one 
@@ -41,19 +46,42 @@
   }
 
   private QualifiedName nameOf(Package p) {
-    String name = p.getName();
-    if (isEmpty(name)) return null;
-    return converter.toQualifiedName(name);
+    List<String> segments = segmentsOf(p);
+    if (segments.isEmpty()) return null;
+    return qualifiedNames.createFqn(segments);
   }
 
   private boolean isSubPackage(QualifiedName name1, QualifiedName name2) {
-    List<String> segments2 = name2.getSegments();
-    int segment2Count = segments2.size();
+    List<String> segments = name2.getSegments();
+    int segment2Count = segments.size();
     int counter = 0;
     for (String segment1 : name1.getSegments()) {
-      if (!segment1.equals(segments2.get(counter++))) return false;
+      if (!segment1.equals(segments.get(counter++))) return false;
       if (counter == segment2Count) break;
     }
     return true;
   }
+
+  public Collection<QualifiedName> addPackageNameSegments(Package p, QualifiedName name) {
+    QualifiedName current = name;
+    List<String> segments = segmentsOf(p);
+    int segmentCount = segments.size();
+    if (segmentCount <= 1) return emptyList();
+    List<QualifiedName> allNames = new ArrayList<QualifiedName>();
+    for (int i = segmentCount - 1; i > 0; i--) {
+      current = QualifiedName.create(segments.get(i)).append(current);
+      allNames.add(current);
+    }
+    return unmodifiableList(allNames);
+  }
+
+  public List<String> segmentsOf(Package p) {
+    if (p == null) return emptyList();
+    List<String> segments = new ArrayList<String>();
+    for (Name segment : p.getSegments()) {
+      String value = names.valueOf(segment);
+      if (value != null) segments.add(value);
+    }
+    return unmodifiableList(segments);
+  }
 }
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/QualifiedNames.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/QualifiedNames.java
new file mode 100644
index 0000000..400ba72
--- /dev/null
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/model/util/QualifiedNames.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2011 Google Inc.
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License v1.0 which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package com.google.eclipse.protobuf.model.util;
+
+import com.google.inject.Singleton;
+
+import org.eclipse.xtext.naming.QualifiedName;
+
+import java.util.*;
+
+/**
+ * Utility methods related to <code>{@link QualifiedName}</code>s.
+ * 
+ * @author alruiz@google.com (Alex Ruiz)
+ */
+@Singleton
+public class QualifiedNames {
+
+  public QualifiedName createFqn(List<String> segments) {
+    return QualifiedName.create(asArray(segments));
+  }
+  
+  private String[] asArray(List<String> list) {
+    return list.toArray(new String[list.size()]);
+  }
+  
+  public QualifiedName addLeadingDot(QualifiedName name) {
+    if (name.getFirstSegment().equals("")) return name;
+    List<String> segments = new ArrayList<String>();
+    segments.addAll(name.getSegments());
+    segments.add(0, "");
+    return QualifiedName.create(segments.toArray(new String[segments.size()]));
+  }
+}
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/LocalNamesProvider.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/LocalNamesProvider.java
index 55983b5..03340b4 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/LocalNamesProvider.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/LocalNamesProvider.java
@@ -10,12 +10,10 @@
 
 import static com.google.eclipse.protobuf.naming.Naming.NamingUsage.*;
 import static java.util.Collections.*;
-import static org.eclipse.xtext.util.SimpleAttributeResolver.newResolver;
 import static org.eclipse.xtext.util.Strings.isEmpty;
 import static org.eclipse.xtext.util.Tuples.pair;
 
-import com.google.common.base.Function;
-import com.google.eclipse.protobuf.model.util.ModelFinder;
+import com.google.eclipse.protobuf.model.util.*;
 import com.google.eclipse.protobuf.naming.Naming.NamingUsage;
 import com.google.inject.*;
 
@@ -62,11 +60,10 @@
   @Inject private final IQualifiedNameConverter converter = new IQualifiedNameConverter.DefaultImpl();
 
   @Inject private ModelFinder finder;
+  @Inject private NameResolver nameResolver;
   @Inject private Naming naming;
-  @Inject private QualifiedNames qualifiedNames;
+  @Inject private Packages packages;
 
-  private final Function<EObject, String> resolver = newResolver(String.class, "name");
-  
   public List<QualifiedName> names(EObject e) {
     return allNames(e, DEFAULT);
   }
@@ -87,12 +84,12 @@
         allNames.add(qualifiedName);
         while (current.eContainer() != null) {
           current = current.eContainer();
-          String containerName = resolver.apply(current);
+          String containerName = nameResolver.nameOf(current);
           if (isEmpty(containerName)) continue;
           qualifiedName = converter.toQualifiedName(containerName).append(qualifiedName);
           allNames.add(qualifiedName);
         }
-        allNames.addAll(qualifiedNames.addPackageNameSegments(qualifiedName, finder.packageOf(e)));
+        allNames.addAll(packages.addPackageNameSegments(finder.packageOf(e), qualifiedName));
         return unmodifiableList(allNames);
       }
     });
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/NameResolver.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/NameResolver.java
new file mode 100644
index 0000000..9a1b666
--- /dev/null
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/NameResolver.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2011 Google Inc.
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License v1.0 which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package com.google.eclipse.protobuf.naming;
+
+import com.google.eclipse.protobuf.protobuf.Name;
+import com.google.eclipse.protobuf.protobuf.Package;
+import com.google.inject.Singleton;
+
+import org.eclipse.emf.ecore.*;
+
+import java.util.List;
+
+/**
+ * @author alruiz@google.com (Alex Ruiz)
+ */
+@Singleton
+public class NameResolver {
+
+  public String nameOf(EObject o) {
+    if (o instanceof Package) return nameOf((Package) o);
+    Object value = nameFeatureOf(o);
+    if (value instanceof Name) return ((Name) value).getValue();
+    return null;
+  }
+
+  private String nameOf(Package p) {
+    List<Name> segments = p.getSegments();
+    int segmentCount = segments.size();
+    if (segmentCount == 0) return null;
+    StringBuilder b = new StringBuilder();
+    for (int i = 0; i < segmentCount; i++) {
+      b.append(segments.get(i).getValue());
+      if (i < segmentCount - 1) b.append(".");
+    }
+    return b.toString();
+  }
+  
+  
+  private Object nameFeatureOf(EObject e) {
+    EStructuralFeature f = e.eClass().getEStructuralFeature("name");
+    return (f != null) ? e.eGet(f) : null;
+  }
+}
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/Naming.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/Naming.java
index 91a7985..c1406d0 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/Naming.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/Naming.java
@@ -8,9 +8,6 @@
  */
 package com.google.eclipse.protobuf.naming;
 
-import static org.eclipse.xtext.util.SimpleAttributeResolver.newResolver;
-
-import com.google.common.base.Function;
 import com.google.eclipse.protobuf.model.util.Options;
 import com.google.eclipse.protobuf.protobuf.*;
 import com.google.inject.*;
@@ -25,10 +22,9 @@
 @Singleton
 public class Naming {
 
+  @Inject private NameResolver nameResolver;
   @Inject private Options options;
 
-  private final Function<EObject, String> resolver = newResolver(String.class, "name");
-
   /**
    * Returns the name of the given object. If the name will be used for an option and if the given object is a 
    * <code>{@link Group}</code>, this method will return the name of the group in lower case.
@@ -37,8 +33,9 @@
    * @return the name of the given object.
    */
   String nameOf(EObject e, NamingUsage usage) {
-    if (NamingUsage.DEFAULT.equals(usage)) return resolver.apply(e);
-    return (e instanceof IndexedElement) ? options.nameForOption((IndexedElement) e) : resolver.apply(e);
+    if (NamingUsage.DEFAULT.equals(usage)) return nameResolver.nameOf(e);
+    if (e instanceof IndexedElement) return options.nameForOption((IndexedElement) e);
+    return nameResolver.nameOf(e);
   }
 
   /**
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider.java
index e4df283..b455d55 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider.java
@@ -16,6 +16,8 @@
 import org.eclipse.xtext.naming.*;
 import org.eclipse.xtext.util.*;
 
+import java.util.List;
+
 import com.google.eclipse.protobuf.model.util.*;
 import com.google.eclipse.protobuf.naming.Naming.NamingUsage;
 import com.google.eclipse.protobuf.protobuf.Package;
@@ -34,6 +36,8 @@
 
   @Inject private ModelFinder finder;
   @Inject private Naming naming;
+  @Inject private Packages packages;
+  @Inject private QualifiedNames qualifiedNames;
 
   @Override public QualifiedName getFullyQualifiedName(EObject e) {
     return getFullyQualifiedName(e, DEFAULT);
@@ -68,9 +72,9 @@
       return qualifiedName;
     Package p = finder.packageOf(obj);
     if (p == null) return qualifiedName;
-    String packageName = p.getName();
-    if (isEmpty(packageName)) return qualifiedName;
-    QualifiedName packageQualifiedName = converter.toQualifiedName(packageName);
+    List<String> segments = packages.segmentsOf(p);
+    if (segments.isEmpty()) return qualifiedName;
+    QualifiedName packageQualifiedName = qualifiedNames.createFqn(segments);
     if (qualifiedName.startsWith(packageQualifiedName)) return qualifiedName;
     return packageQualifiedName.append(qualifiedName);
   }
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/QualifiedNames.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/QualifiedNames.java
deleted file mode 100644
index 086214f..0000000
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/QualifiedNames.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2011 Google Inc.
- *
- * All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
- * Public License v1.0 which accompanies this distribution, and is available at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- */
-package com.google.eclipse.protobuf.naming;
-
-import static java.util.Collections.*;
-import static org.eclipse.xtext.util.Strings.isEmpty;
-
-import java.util.*;
-
-import org.eclipse.xtext.naming.*;
-
-import com.google.eclipse.protobuf.protobuf.Package;
-import com.google.inject.Inject;
-
-/**
- * @author alruiz@google.com (Alex Ruiz)
- */
-public class QualifiedNames {
-
-  @Inject private final IQualifiedNameConverter converter = new IQualifiedNameConverter.DefaultImpl();
-
-  public QualifiedName addLeadingDot(QualifiedName name) {
-    if (name.getFirstSegment().equals("")) return name;
-    List<String> segments = new ArrayList<String>();
-    segments.addAll(name.getSegments());
-    segments.add(0, "");
-    return QualifiedName.create(segments.toArray(new String[segments.size()]));
-  }
-
-  public Collection<QualifiedName> addPackageNameSegments(QualifiedName name, Package p) {
-    QualifiedName current = name;
-    List<String> segments = fqnSegments(p);
-    int segmentCount = segments.size();
-    if (segmentCount <= 1) return emptyList();
-    List<QualifiedName> allNames = new ArrayList<QualifiedName>();
-    for (int i = segmentCount - 1; i > 0; i--) {
-      current = QualifiedName.create(segments.get(i)).append(current);
-      allNames.add(current);
-    }
-    return unmodifiableList(allNames);
-  }
-
-  private List<String> fqnSegments(Package p) {
-    if (p == null) return emptyList();
-    String packageName = p.getName();
-    if (isEmpty(packageName)) return emptyList();
-    return converter.toQualifiedName(packageName).getSegments();
-  }
-}
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/CustomOptionScopeFinder.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/CustomOptionScopeFinder.java
index 07dc9c0..171dff4 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/CustomOptionScopeFinder.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/CustomOptionScopeFinder.java
@@ -73,6 +73,11 @@
     if (!(o instanceof MessageExtension)) return false;
     Message message = modelFinder.messageFrom((MessageExtension) o);
     if (message == null) return false;
-    return optionType.messageName().equals(message.getName());
+    Name name = message.getName();
+    if (name != null) {
+      String nameValue = name.getValue();
+      return optionType.messageName().equals(nameValue);
+    }
+    return false;
   }
 }
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/FieldNotationScopeFinder.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/FieldNotationScopeFinder.java
index 967478f..2269594 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/FieldNotationScopeFinder.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/FieldNotationScopeFinder.java
@@ -28,6 +28,7 @@
   @Inject private FieldOptions fieldOptions;
   @Inject private Options options;
   @Inject private ModelFinder modelFinder;
+  @Inject private Names names;
   @Inject private QualifiedNameDescriptions qualifiedNameDescriptions;
 
   Collection<IEObjectDescription> sourceOf(FieldName name) {
@@ -72,8 +73,9 @@
     Message fieldType = modelFinder.messageTypeOf(field);
     for (MessageElement element : fieldType.getElements()) {
       if (element instanceof MessageField) {
-        String name = ((MessageField) element).getName();
-        descriptions.add(create(name, element));
+        Name name = ((MessageField) element).getName();
+        String nameValue = names.valueOf(name);
+        descriptions.add(create(nameValue, element));
       }
     }
     return descriptions;
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/LiteralDescriptions.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/LiteralDescriptions.java
index 0b847f3..2cc54ae 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/LiteralDescriptions.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/LiteralDescriptions.java
@@ -12,23 +12,29 @@
 import static org.eclipse.xtext.EcoreUtil2.getAllContentsOfType;
 import static org.eclipse.xtext.resource.EObjectDescription.create;
 
-import java.util.*;
+import com.google.eclipse.protobuf.model.util.Names;
+import com.google.eclipse.protobuf.protobuf.*;
+import com.google.eclipse.protobuf.protobuf.Enum;
+import com.google.inject.Inject;
 
 import org.eclipse.xtext.resource.IEObjectDescription;
 
-import com.google.eclipse.protobuf.protobuf.*;
-import com.google.eclipse.protobuf.protobuf.Enum;
+import java.util.*;
 
 /**
  * @author alruiz@google.com (Alex Ruiz)
  */
 class LiteralDescriptions {
 
+  @Inject private Names names;
+  
   Collection<IEObjectDescription> literalsOf(Enum anEnum) {
     if (anEnum == null) return emptyList();
     List<IEObjectDescription> descriptions = new ArrayList<IEObjectDescription>();
-    for (Literal literal : getAllContentsOfType(anEnum, Literal.class))
-      descriptions.add(create(literal.getName(), literal));
+    for (Literal literal : getAllContentsOfType(anEnum, Literal.class)) {
+      String nameValue = names.valueOf(literal.getName());
+      descriptions.add(create(nameValue, literal));
+    }
     return descriptions;
   }
 }
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/NativeOptionDescriptions.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/NativeOptionDescriptions.java
index 44f0eca..72b3079 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/NativeOptionDescriptions.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/NativeOptionDescriptions.java
@@ -11,6 +11,7 @@
 import static java.util.Collections.emptyList;
 import static org.eclipse.xtext.resource.EObjectDescription.create;
 
+import com.google.eclipse.protobuf.model.util.Names;
 import com.google.eclipse.protobuf.protobuf.*;
 import com.google.inject.Inject;
 
@@ -25,6 +26,7 @@
 class NativeOptionDescriptions {
 
   @Inject private ProtoDescriptorProvider descriptorProvider;
+  @Inject private Names names;
   
   Collection <IEObjectDescription> sources(NativeOption option) {
     return allSources(option);
@@ -44,7 +46,8 @@
   private Collection<IEObjectDescription> describe(Collection<MessageField> fields) {
     List<IEObjectDescription> descriptions = new ArrayList<IEObjectDescription>();
     for (MessageField field : fields) {
-      descriptions.add(create(field.getName(), field));
+      String nameValue = names.valueOf(field.getName());
+      descriptions.add(create(nameValue, field));
     }
     return descriptions;
   }
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/PackageIntersectionDescriptions.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/PackageIntersectionDescriptions.java
index 30c5d6d..42c174a 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/PackageIntersectionDescriptions.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/PackageIntersectionDescriptions.java
@@ -8,18 +8,17 @@
  */
 package com.google.eclipse.protobuf.scoping;
 
-import static java.util.Collections.*;
+import static java.util.Collections.emptySet;
 import static org.eclipse.xtext.resource.EObjectDescription.create;
-import static org.eclipse.xtext.util.SimpleAttributeResolver.newResolver;
 
+import com.google.eclipse.protobuf.model.util.*;
+import com.google.eclipse.protobuf.naming.NameResolver;
+import com.google.eclipse.protobuf.protobuf.Package;
 import com.google.inject.Inject;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.naming.*;
-import org.eclipse.xtext.resource.*;
-
-import com.google.common.base.Function;
-import com.google.eclipse.protobuf.protobuf.Package;
+import org.eclipse.xtext.naming.QualifiedName;
+import org.eclipse.xtext.resource.IEObjectDescription;
 
 import java.util.*;
 
@@ -28,9 +27,9 @@
  */
 class PackageIntersectionDescriptions {
 
-  @Inject private final IQualifiedNameConverter converter = new IQualifiedNameConverter.DefaultImpl();
-
-  private final Function<EObject, String> resolver = newResolver(String.class, "name");
+  @Inject private Packages packages;
+  @Inject private QualifiedNames qualifiedNames;
+  @Inject private NameResolver nameResolver;
 
   // See issue 161
   Collection<IEObjectDescription> intersection(Package fromImporter, Package fromImported, EObject e) {
@@ -39,7 +38,7 @@
   }
   
   private List<String> segmentNames(Package aPackage) {
-    return converter.toQualifiedName(aPackage.getName()).getSegments();
+    return packages.segmentsOf(aPackage);
   }
   
   private Collection<IEObjectDescription> intersection(List<String> packageInImporter, List<String> packageInImported,
@@ -55,7 +54,7 @@
     }
     if (start == 0) return emptySet(); // no intersection found.
     List<String> intersection = new ArrayList<String>();
-    intersection.add(resolver.apply(e));
+    intersection.add(nameResolver.nameOf(e));
     Set<IEObjectDescription> descriptions = new HashSet<IEObjectDescription>();
     for (int i = n2Count - 1; i >= 0; i--) {
       if (i >= start) {
@@ -72,6 +71,6 @@
   }
   
   private QualifiedName fqn(List<String> segments) {
-    return QualifiedName.create(segments.toArray(new String[segments.size()]));
+    return qualifiedNames.createFqn(segments);
   }
 }
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor.java
index 7fba47b..1127262 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor.java
@@ -98,11 +98,11 @@
   }
 
   private void initContents() {
-    allTypes.addAll(getAllContentsOfType(root, ComplexType.class));
+    allTypes.addAll(getAllContentsOfType(root, Message.class));
     for (ComplexType t : allTypes) {
       if (!(t instanceof Message)) continue;
       Message m = (Message) t;
-      OptionType type = OPTION_DEFINITION_BY_NAME.get(m.getName());
+      OptionType type = OPTION_DEFINITION_BY_NAME.get(m.getName().getValue());
       if (type == null) continue;
       initOptions(m, type);
     }
@@ -116,14 +116,16 @@
       }
       if (e instanceof Enum) {
         Enum anEnum = (Enum) e;
-        enumsByName.put(anEnum.getName(), anEnum);
+        Name name = anEnum.getName();
+        enumsByName.put(name.getValue(), anEnum);
       }
     }
   }
 
   private void addOption(MessageField optionSource, OptionType type) {
     if (shouldIgnore(optionSource)) return;
-    optionsByType.get(type).put(optionSource.getName(), optionSource);
+    Name name = optionSource.getName();
+    optionsByType.get(type).put(name.getValue(), optionSource);
   }
 
   private boolean shouldIgnore(MessageField field) {
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/QualifiedNameDescriptions.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/QualifiedNameDescriptions.java
index af90372..7578cc1 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/QualifiedNameDescriptions.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/QualifiedNameDescriptions.java
@@ -10,6 +10,7 @@
 
 import static org.eclipse.xtext.resource.EObjectDescription.create;
 
+import com.google.eclipse.protobuf.model.util.QualifiedNames;
 import com.google.eclipse.protobuf.naming.*;
 import com.google.inject.Inject;
 
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator.java
index 4ac564b..0d5005c 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/validation/ProtobufJavaValidator.java
@@ -124,7 +124,7 @@
     Protobuf root = (Protobuf) aPackage.eContainer();
     for (ProtobufElement e : root.getElements()) {
       if (e == aPackage) {
-        if (firstFound) error(multiplePackages, aPackage, PACKAGE__NAME, MORE_THAN_ONE_PACKAGE_ERROR);
+        if (firstFound) error(multiplePackages, aPackage, PACKAGE__SEGMENTS, MORE_THAN_ONE_PACKAGE_ERROR);
         return;
       }
       if (e instanceof Package && !firstFound) firstFound = true;