diff --git a/samples/tutorials/p5_queryoptions-tis/pom.xml b/samples/tutorials/p5_queryoptions-tcs/pom.xml
similarity index 97%
rename from samples/tutorials/p5_queryoptions-tis/pom.xml
rename to samples/tutorials/p5_queryoptions-tcs/pom.xml
index db1e18c4b..d9b463e5b 100755
--- a/samples/tutorials/p5_queryoptions-tis/pom.xml
+++ b/samples/tutorials/p5_queryoptions-tcs/pom.xml
@@ -23,7 +23,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>my.group.id</groupId>
-	<artifactId>DemoService-QueryOptions-TIS</artifactId>
+	<artifactId>DemoService-QueryOptions-TCS</artifactId>
 	<packaging>war</packaging>
 	<version>0.0.1</version>
 
diff --git a/samples/tutorials/p5_queryoptions-tis/src/main/java/myservice/mynamespace/data/Storage.java b/samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/data/Storage.java
similarity index 100%
rename from samples/tutorials/p5_queryoptions-tis/src/main/java/myservice/mynamespace/data/Storage.java
rename to samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/data/Storage.java
diff --git a/samples/tutorials/p5_queryoptions-tis/src/main/java/myservice/mynamespace/service/DemoEdmProvider.java b/samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/service/DemoEdmProvider.java
similarity index 100%
rename from samples/tutorials/p5_queryoptions-tis/src/main/java/myservice/mynamespace/service/DemoEdmProvider.java
rename to samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/service/DemoEdmProvider.java
diff --git a/samples/tutorials/p5_queryoptions-tis/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java b/samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java
similarity index 100%
rename from samples/tutorials/p5_queryoptions-tis/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java
rename to samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java
diff --git a/samples/tutorials/p5_queryoptions-tis/src/main/java/myservice/mynamespace/service/DemoEntityProcessor.java b/samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/service/DemoEntityProcessor.java
similarity index 100%
rename from samples/tutorials/p5_queryoptions-tis/src/main/java/myservice/mynamespace/service/DemoEntityProcessor.java
rename to samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/service/DemoEntityProcessor.java
diff --git a/samples/tutorials/p5_queryoptions-tis/src/main/java/myservice/mynamespace/service/DemoPrimitiveProcessor.java b/samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/service/DemoPrimitiveProcessor.java
similarity index 100%
rename from samples/tutorials/p5_queryoptions-tis/src/main/java/myservice/mynamespace/service/DemoPrimitiveProcessor.java
rename to samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/service/DemoPrimitiveProcessor.java
diff --git a/samples/tutorials/p5_queryoptions-tis/src/main/java/myservice/mynamespace/util/Util.java b/samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/util/Util.java
similarity index 100%
rename from samples/tutorials/p5_queryoptions-tis/src/main/java/myservice/mynamespace/util/Util.java
rename to samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/util/Util.java
diff --git a/samples/tutorials/p5_queryoptions-tis/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/web/DemoServlet.java
similarity index 100%
rename from samples/tutorials/p5_queryoptions-tis/src/main/java/myservice/mynamespace/web/DemoServlet.java
rename to samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/web/DemoServlet.java
diff --git a/samples/tutorials/p5_queryoptions-tis/src/main/webapp/WEB-INF/web.xml b/samples/tutorials/p5_queryoptions-tcs/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from samples/tutorials/p5_queryoptions-tis/src/main/webapp/WEB-INF/web.xml
rename to samples/tutorials/p5_queryoptions-tcs/src/main/webapp/WEB-INF/web.xml
diff --git a/samples/tutorials/p5_queryoptions-tis/src/main/webapp/index.jsp b/samples/tutorials/p5_queryoptions-tcs/src/main/webapp/index.jsp
similarity index 100%
rename from samples/tutorials/p5_queryoptions-tis/src/main/webapp/index.jsp
rename to samples/tutorials/p5_queryoptions-tcs/src/main/webapp/index.jsp
diff --git a/samples/tutorials/pom.xml b/samples/tutorials/pom.xml
index cfa48a40f..c00028ede 100644
--- a/samples/tutorials/pom.xml
+++ b/samples/tutorials/pom.xml
@@ -39,7 +39,7 @@
     <module>p2_readep</module>
     <module>p3_write</module>
     <module>p4_navigation</module>
-    <module>p5_queryoptions-tis</module>
+    <module>p5_queryoptions-tcs</module>
     <module>p6_queryoptions-es</module>
   </modules>