Test Twitter
diff --git a/demos/twitter/src/main/java/com/datatorrent/demos/twitter/TwitterTrendingHashtagsApplication.java b/demos/twitter/src/main/java/com/datatorrent/demos/twitter/TwitterTrendingHashtagsApplication.java
index 0dd5a24..74d0b18 100644
--- a/demos/twitter/src/main/java/com/datatorrent/demos/twitter/TwitterTrendingHashtagsApplication.java
+++ b/demos/twitter/src/main/java/com/datatorrent/demos/twitter/TwitterTrendingHashtagsApplication.java
@@ -139,7 +139,7 @@
  *
  * @since 1.0.2
  */
-@ApplicationAnnotation(name="TwitterTrendingDemo-Customer")
+@ApplicationAnnotation(name="TwitterTrendingDemoTest")
 public class TwitterTrendingHashtagsApplication implements StreamingApplication
 {
   public static final String TABULAR_SCHEMA = "twitterHashTagDataSchema.json";
diff --git a/demos/twitter/src/main/resources/META-INF/properties.xml b/demos/twitter/src/main/resources/META-INF/properties.xml
index 15403bb..80dae65 100644
--- a/demos/twitter/src/main/resources/META-INF/properties.xml
+++ b/demos/twitter/src/main/resources/META-INF/properties.xml
@@ -75,12 +75,12 @@
   <!-- TwitterTrendingDemo -->
 
   <property>
-    <name>dt.application.TwitterTrendingDemo-Customer.operator.Query.topic</name>
-    <value>TwitterHashtagQuery</value>
+    <name>dt.application.TwitterTrendingDemoTest.operator.Query.topic</name>
+    <value>TwitterHashtagQueryTest</value>
   </property>
   <property>
-    <name>dt.application.TwitterTrendingDemo-Customer.operator.QueryResult.topic</name>
-    <value>TwitterHashtagQueryResult</value>
+    <name>dt.application.TwitterTrendingDemoTest.operator.QueryResult.topic</name>
+    <value>TwitterHashtagQueryResultTest</value>
   </property>
 
 </configuration>