diff --git a/samples/tutorials/p6_queryoptions-es/src/main/java/myservice/mynamespace/service/DemoEdmProvider.java b/samples/tutorials/p6_queryoptions-es/src/main/java/myservice/mynamespace/service/DemoEdmProvider.java
index 7b1fef806..248cfba38 100755
--- a/samples/tutorials/p6_queryoptions-es/src/main/java/myservice/mynamespace/service/DemoEdmProvider.java
+++ b/samples/tutorials/p6_queryoptions-es/src/main/java/myservice/mynamespace/service/DemoEdmProvider.java
@@ -77,7 +77,7 @@ public class DemoEdmProvider extends CsdlAbstractEdmProvider {
 
       // navigation property: many-to-one, null not allowed (product must have a category)
       CsdlNavigationProperty navProp = new CsdlNavigationProperty().setName("Category")
-          .setType(ET_CATEGORY_FQN).setNullable(false).setPartner("Products");
+          .setType(ET_CATEGORY_FQN).setNullable(false).setPartner("RelProducts");
       List<CsdlNavigationProperty> navPropList = new ArrayList<CsdlNavigationProperty>();
       navPropList.add(navProp);
 
@@ -100,7 +100,7 @@ public class DemoEdmProvider extends CsdlAbstractEdmProvider {
       propertyRef.setName("ID");
 
       // navigation property: one-to-many
-      CsdlNavigationProperty navProp = new CsdlNavigationProperty().setName("Products")
+      CsdlNavigationProperty navProp = new CsdlNavigationProperty().setName("RelProducts")
           .setType(ET_PRODUCT_FQN).setCollection(true).setPartner("Category");
       List<CsdlNavigationProperty> navPropList = new ArrayList<CsdlNavigationProperty>();
       navPropList.add(navProp);
@@ -147,7 +147,7 @@ public class DemoEdmProvider extends CsdlAbstractEdmProvider {
         // navigation
         CsdlNavigationPropertyBinding navPropBinding = new CsdlNavigationPropertyBinding();
         navPropBinding.setTarget("Products"); // the target entity set, where the navigation property points to
-        navPropBinding.setPath("Products"); // the path from entity type to navigation property
+        navPropBinding.setPath("RelProducts"); // the path from entity type to navigation property
         List<CsdlNavigationPropertyBinding> navPropBindingList = new ArrayList<CsdlNavigationPropertyBinding>();
         navPropBindingList.add(navPropBinding);
         entitySet.setNavigationPropertyBindings(navPropBindingList);
diff --git a/samples/tutorials/p6_queryoptions-es/src/main/webapp/index.jsp b/samples/tutorials/p6_queryoptions-es/src/main/webapp/index.jsp
index cee3a3190..344b026e7 100755
--- a/samples/tutorials/p6_queryoptions-es/src/main/webapp/index.jsp
+++ b/samples/tutorials/p6_queryoptions-es/src/main/webapp/index.jsp
@@ -31,10 +31,10 @@ under the License.
         <a href="DemoService.svc/Products/?$expand=Category">Expand - /Products/?$expand=Category</a>
     </li>
     <li>
-        <a href="DemoService.svc/Categories(1)/?$expand=Products">Expand - /Categories(1)/?$expand=Products</a>
+        <a href="DemoService.svc/Categories(1)/?$expand=RelProducts">Expand - /Categories(1)/?$expand=RelProducts</a>
     </li>
     <li>
-        <a href="DemoService.svc/Categories/?$expand=Products">Expand - /DemoService.svc/Categories/?$expand=Products</a>
+        <a href="DemoService.svc/Categories/?$expand=RelProducts">Expand - /Categories/?$expand=RelProducts</a>
     </li>
 </ul>