diff --git a/README.md b/README.md
index ba272047..1acf9c4e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-mon-persister
+monasca-persister
 =============
 
 The Monitoring Persister consumes metrics and alarm state transitions from the Message Queue and stores them in the Metrics and Alarms database.
@@ -11,7 +11,7 @@ The number of output processors/threads in the Persister can be specified to sca
 
 # Build
 
-Requires mon-common from https://github.com/hpcloud-mon/mon-common. Download and build following instructions in its README.md. Then build mon-persister by:
+Requires monasca-common from https://github.com/stackforge/monasca-common. Download and build following instructions in its README.md. Then build monasca-persister by:
 
 ```
 mvn clean package
diff --git a/pom.xml b/pom.xml
index 81aa25e0..04e5203e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>monasca-persister</groupId>
-    <artifactId>mon-persister</artifactId>
+    <artifactId>monasca-persister</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <properties>
@@ -18,8 +18,8 @@
 
     <!--Needed for buildnumber-maven-plugin-->
     <scm>
-        <connection>scm:git:git@keg.dev.uswest.hpcloud.net:som-persister</connection>
-        <developerConnection>scm:git:git@keg.dev.uswest.hpcloud.net:som-persister
+        <connection>scm:git:git@github.com:stackforge/monasca-persister</connection>
+        <developerConnection>scm:git:git@github.com:stackforge/monasca-persister
         </developerConnection>
     </scm>
 
@@ -151,7 +151,7 @@
                                         implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>com.hpcloud.mon.persister.MonPersisterApplication
+                                    <mainClass>monasca.persister.MonPersisterApplication
                                     </mainClass>
                                 </transformer>
                             </transformers>
@@ -216,19 +216,19 @@
                                     <type>file</type>
                                     <src>${project.build.directory}/${artifactNamedVersion}.jar
                                     </src>
-                                    <dst>/opt/mon/mon-persister.jar</dst>
+                                    <dst>/opt/monasca/monasca-persister.jar</dst>
                                 </data>
                                 <data>
                                     <type>file</type>
-                                    <src>${project.basedir}/src/deb/init/mon-persister.conf</src>
-                                    <dst>/etc/init/mon-persister.conf</dst>
+                                    <src>${project.basedir}/src/deb/init/monasca-persister.conf</src>
+                                    <dst>/etc/init/monasca-persister.conf</dst>
                                 </data>
                                 <data>
                                     <type>file</type>
                                     <src>
                                         ${project.basedir}/src/deb/etc/persister-config.yml-sample
                                     </src>
-                                    <dst>/etc/mon/persister-config.yml-sample</dst>
+                                    <dst>/etc/monasca/persister-config.yml-sample</dst>
                                 </data>
                             </dataSet>
                         </configuration>
diff --git a/src/deb/control/postinst b/src/deb/control/postinst
index 090993c2..724d8cd2 100755
--- a/src/deb/control/postinst
+++ b/src/deb/control/postinst
@@ -7,8 +7,8 @@ case "$1" in
     fi
 
     #Restart does not pick up upstart job config changes stop/start is needed
-    stop mon-persister
-    start mon-persister
+    stop monasca-persister
+    start monasca-persister
   ;;
 esac
 
diff --git a/src/deb/control/prerm b/src/deb/control/prerm
index aab6f389..88811912 100644
--- a/src/deb/control/prerm
+++ b/src/deb/control/prerm
@@ -2,7 +2,7 @@
 
 case "$1" in
   remove)
-    stop mon-persister
+    stop monasca-persister
   ;;
 esac
 
diff --git a/src/deb/etc/persister-config.yml-sample b/src/deb/etc/persister-config.yml-sample
index dd13ad5d..2de7f4f1 100755
--- a/src/deb/etc/persister-config.yml-sample
+++ b/src/deb/etc/persister-config.yml-sample
@@ -1,4 +1,4 @@
-name: mon-persister
+name: monasca-persister
 
 #Kafka settings.
 kafkaConfiguration:
@@ -42,7 +42,7 @@ verticaMetricRepositoryConfiguration:
 
 databaseConfiguration:
   driverClass: com.vertica.jdbc.Driver
-#  url: jdbc:vertica://mon-aw1rdd1-vertica0001.rndd.aw1.hpcloud.net:5433/som
+#  url: jdbc:vertica://mini-mon:5433/monasca
   url: jdbc:vertica://15.185.94.245:5433/som
   user: persister
   password: password
@@ -117,7 +117,7 @@ logging:
     # The file to which statements will be logged.
     #
     # If enabled is true, this must be specified.
-    currentLogFilename: ./logs/mon-persister.log
+    currentLogFilename: ./logs/monasca-persister.log
 
     # If true, log files are rotated and archived.
     archive: true
@@ -127,7 +127,7 @@ logging:
     # and new statements written to it.
     #
     # If archive is true, this must be specified.
-    archivedLogFilenamePattern: ./logs/mon-persister-%d.log.gz
+    archivedLogFilenamePattern: ./logs/monasca-persister-%d.log.gz
 
     # The maximum number of log files to archive.
     archivedFileCount: 5
@@ -157,4 +157,4 @@ logging:
     timeZone: UTC
 
     # A custom Logback format string.
-    logFormat: null
\ No newline at end of file
+    logFormat: null
diff --git a/src/deb/init/mon-persister.conf b/src/deb/init/mon-persister.conf
deleted file mode 100644
index 1cd8850b..00000000
--- a/src/deb/init/mon-persister.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Startup script for the mon-persister
-
-description "MON Persister java app"
-start on runlevel [2345]
-
-console log
-respawn
-
-setgid persister
-setuid persister
-exec /usr/bin/java -Dfile.encoding=UTF-8 -Xmx8g -cp /opt/mon/mon-persister.jar:/opt/mon/vertica/vertica_jdbc.jar com.hpcloud.mon.persister.MonPersisterApplication server /etc/mon/persister-config.yml
diff --git a/src/deb/init/monasca-persister.conf b/src/deb/init/monasca-persister.conf
new file mode 100644
index 00000000..e9546eb8
--- /dev/null
+++ b/src/deb/init/monasca-persister.conf
@@ -0,0 +1,11 @@
+# Startup script for the monasca-persister
+
+description "Monasca Persister java app"
+start on runlevel [2345]
+
+console log
+respawn
+
+setgid monasca
+setuid persister
+exec /usr/bin/java -Dfile.encoding=UTF-8 -Xmx8g -cp /opt/monasca/monasca-persister.jar:/opt/monasca/vertica/vertica_jdbc.jar monasca.persister.MonPersisterApplication server /etc/monasca/persister-config.yml
diff --git a/src/main/java/com/hpcloud/mon/persister/MonPersisterApplication.java b/src/main/java/monasca/persister/MonPersisterApplication.java
similarity index 80%
rename from src/main/java/com/hpcloud/mon/persister/MonPersisterApplication.java
rename to src/main/java/monasca/persister/MonPersisterApplication.java
index 5634c185..373d68ba 100644
--- a/src/main/java/com/hpcloud/mon/persister/MonPersisterApplication.java
+++ b/src/main/java/monasca/persister/MonPersisterApplication.java
@@ -15,27 +15,27 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister;
+package monasca.persister;
 
-import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
-import com.hpcloud.mon.persister.consumer.AlarmStateTransitionConsumer;
-import com.hpcloud.mon.persister.consumer.AlarmStateTransitionConsumerFactory;
-import com.hpcloud.mon.persister.consumer.KafkaAlarmStateTransitionConsumer;
-import com.hpcloud.mon.persister.consumer.KafkaAlarmStateTransitionConsumerFactory;
-import com.hpcloud.mon.persister.consumer.KafkaChannel;
-import com.hpcloud.mon.persister.consumer.KafkaChannelFactory;
-import com.hpcloud.mon.persister.consumer.KafkaMetricsConsumer;
-import com.hpcloud.mon.persister.consumer.KafkaMetricsConsumerFactory;
-import com.hpcloud.mon.persister.consumer.MetricsConsumer;
-import com.hpcloud.mon.persister.consumer.MetricsConsumerFactory;
-import com.hpcloud.mon.persister.healthcheck.SimpleHealthCheck;
-import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
-import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipelineFactory;
-import com.hpcloud.mon.persister.pipeline.MetricPipeline;
-import com.hpcloud.mon.persister.pipeline.MetricPipelineFactory;
-import com.hpcloud.mon.persister.pipeline.event.AlarmStateTransitionedEventHandlerFactory;
-import com.hpcloud.mon.persister.pipeline.event.MetricHandlerFactory;
-import com.hpcloud.mon.persister.resource.Resource;
+import monasca.persister.configuration.MonPersisterConfiguration;
+import monasca.persister.consumer.AlarmStateTransitionConsumer;
+import monasca.persister.consumer.AlarmStateTransitionConsumerFactory;
+import monasca.persister.consumer.KafkaAlarmStateTransitionConsumer;
+import monasca.persister.consumer.KafkaAlarmStateTransitionConsumerFactory;
+import monasca.persister.consumer.KafkaChannel;
+import monasca.persister.consumer.KafkaChannelFactory;
+import monasca.persister.consumer.KafkaMetricsConsumer;
+import monasca.persister.consumer.KafkaMetricsConsumerFactory;
+import monasca.persister.consumer.MetricsConsumer;
+import monasca.persister.consumer.MetricsConsumerFactory;
+import monasca.persister.healthcheck.SimpleHealthCheck;
+import monasca.persister.pipeline.AlarmStateTransitionPipeline;
+import monasca.persister.pipeline.AlarmStateTransitionPipelineFactory;
+import monasca.persister.pipeline.MetricPipeline;
+import monasca.persister.pipeline.MetricPipelineFactory;
+import monasca.persister.pipeline.event.AlarmStateTransitionedEventHandlerFactory;
+import monasca.persister.pipeline.event.MetricHandlerFactory;
+import monasca.persister.resource.Resource;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -60,7 +60,7 @@ public class MonPersisterApplication extends Application<MonPersisterConfigurati
 
   @Override
   public String getName() {
-    return "mon-persister";
+    return "monasca-persister";
   }
 
   @Override
diff --git a/src/main/java/com/hpcloud/mon/persister/MonPersisterModule.java b/src/main/java/monasca/persister/MonPersisterModule.java
similarity index 66%
rename from src/main/java/com/hpcloud/mon/persister/MonPersisterModule.java
rename to src/main/java/monasca/persister/MonPersisterModule.java
index f7a0ea44..1a72b597 100644
--- a/src/main/java/com/hpcloud/mon/persister/MonPersisterModule.java
+++ b/src/main/java/monasca/persister/MonPersisterModule.java
@@ -15,38 +15,38 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister;
+package monasca.persister;
 
-import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
-import com.hpcloud.mon.persister.consumer.AlarmStateTransitionConsumer;
-import com.hpcloud.mon.persister.consumer.AlarmStateTransitionConsumerFactory;
-import com.hpcloud.mon.persister.consumer.KafkaAlarmStateTransitionConsumer;
-import com.hpcloud.mon.persister.consumer.KafkaAlarmStateTransitionConsumerFactory;
-import com.hpcloud.mon.persister.consumer.KafkaAlarmStateTransitionConsumerRunnableBasic;
-import com.hpcloud.mon.persister.consumer.KafkaAlarmStateTransitionConsumerRunnableBasicFactory;
-import com.hpcloud.mon.persister.consumer.KafkaChannel;
-import com.hpcloud.mon.persister.consumer.KafkaChannelFactory;
-import com.hpcloud.mon.persister.consumer.KafkaMetricsConsumer;
-import com.hpcloud.mon.persister.consumer.KafkaMetricsConsumerFactory;
-import com.hpcloud.mon.persister.consumer.KafkaMetricsConsumerRunnableBasic;
-import com.hpcloud.mon.persister.consumer.KafkaMetricsConsumerRunnableBasicFactory;
-import com.hpcloud.mon.persister.consumer.MetricsConsumer;
-import com.hpcloud.mon.persister.consumer.MetricsConsumerFactory;
-import com.hpcloud.mon.persister.dbi.DBIProvider;
-import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
-import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipelineFactory;
-import com.hpcloud.mon.persister.pipeline.MetricPipeline;
-import com.hpcloud.mon.persister.pipeline.MetricPipelineFactory;
-import com.hpcloud.mon.persister.pipeline.event.AlarmStateTransitionedEventHandler;
-import com.hpcloud.mon.persister.pipeline.event.AlarmStateTransitionedEventHandlerFactory;
-import com.hpcloud.mon.persister.pipeline.event.MetricHandler;
-import com.hpcloud.mon.persister.pipeline.event.MetricHandlerFactory;
-import com.hpcloud.mon.persister.repository.AlarmRepository;
-import com.hpcloud.mon.persister.repository.InfluxDBAlarmRepository;
-import com.hpcloud.mon.persister.repository.InfluxDBMetricRepository;
-import com.hpcloud.mon.persister.repository.MetricRepository;
-import com.hpcloud.mon.persister.repository.VerticaAlarmRepository;
-import com.hpcloud.mon.persister.repository.VerticaMetricRepository;
+import monasca.persister.configuration.MonPersisterConfiguration;
+import monasca.persister.consumer.AlarmStateTransitionConsumer;
+import monasca.persister.consumer.AlarmStateTransitionConsumerFactory;
+import monasca.persister.consumer.KafkaAlarmStateTransitionConsumer;
+import monasca.persister.consumer.KafkaAlarmStateTransitionConsumerFactory;
+import monasca.persister.consumer.KafkaAlarmStateTransitionConsumerRunnableBasic;
+import monasca.persister.consumer.KafkaAlarmStateTransitionConsumerRunnableBasicFactory;
+import monasca.persister.consumer.KafkaChannel;
+import monasca.persister.consumer.KafkaChannelFactory;
+import monasca.persister.consumer.KafkaMetricsConsumer;
+import monasca.persister.consumer.KafkaMetricsConsumerFactory;
+import monasca.persister.consumer.KafkaMetricsConsumerRunnableBasic;
+import monasca.persister.consumer.KafkaMetricsConsumerRunnableBasicFactory;
+import monasca.persister.consumer.MetricsConsumer;
+import monasca.persister.consumer.MetricsConsumerFactory;
+import monasca.persister.dbi.DBIProvider;
+import monasca.persister.pipeline.AlarmStateTransitionPipeline;
+import monasca.persister.pipeline.AlarmStateTransitionPipelineFactory;
+import monasca.persister.pipeline.MetricPipeline;
+import monasca.persister.pipeline.MetricPipelineFactory;
+import monasca.persister.pipeline.event.AlarmStateTransitionedEventHandler;
+import monasca.persister.pipeline.event.AlarmStateTransitionedEventHandlerFactory;
+import monasca.persister.pipeline.event.MetricHandler;
+import monasca.persister.pipeline.event.MetricHandlerFactory;
+import monasca.persister.repository.AlarmRepository;
+import monasca.persister.repository.InfluxDBAlarmRepository;
+import monasca.persister.repository.InfluxDBMetricRepository;
+import monasca.persister.repository.MetricRepository;
+import monasca.persister.repository.VerticaAlarmRepository;
+import monasca.persister.repository.VerticaMetricRepository;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Scopes;
diff --git a/src/main/java/com/hpcloud/mon/persister/configuration/KafkaConfiguration.java b/src/main/java/monasca/persister/configuration/KafkaConfiguration.java
similarity index 98%
rename from src/main/java/com/hpcloud/mon/persister/configuration/KafkaConfiguration.java
rename to src/main/java/monasca/persister/configuration/KafkaConfiguration.java
index 7c1089f2..e1354722 100644
--- a/src/main/java/com/hpcloud/mon/persister/configuration/KafkaConfiguration.java
+++ b/src/main/java/monasca/persister/configuration/KafkaConfiguration.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.configuration;
+package monasca.persister.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/com/hpcloud/mon/persister/configuration/MonPersisterConfiguration.java b/src/main/java/monasca/persister/configuration/MonPersisterConfiguration.java
similarity index 98%
rename from src/main/java/com/hpcloud/mon/persister/configuration/MonPersisterConfiguration.java
rename to src/main/java/monasca/persister/configuration/MonPersisterConfiguration.java
index e184c575..669c1144 100644
--- a/src/main/java/com/hpcloud/mon/persister/configuration/MonPersisterConfiguration.java
+++ b/src/main/java/monasca/persister/configuration/MonPersisterConfiguration.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.configuration;
+package monasca.persister.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/com/hpcloud/mon/persister/configuration/PipelineConfiguration.java b/src/main/java/monasca/persister/configuration/PipelineConfiguration.java
similarity index 97%
rename from src/main/java/com/hpcloud/mon/persister/configuration/PipelineConfiguration.java
rename to src/main/java/monasca/persister/configuration/PipelineConfiguration.java
index f3325cc2..b21550eb 100644
--- a/src/main/java/com/hpcloud/mon/persister/configuration/PipelineConfiguration.java
+++ b/src/main/java/monasca/persister/configuration/PipelineConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.configuration;
+package monasca.persister.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/com/hpcloud/mon/persister/configuration/VerticaMetricRepositoryConfiguration.java b/src/main/java/monasca/persister/configuration/VerticaMetricRepositoryConfiguration.java
similarity index 95%
rename from src/main/java/com/hpcloud/mon/persister/configuration/VerticaMetricRepositoryConfiguration.java
rename to src/main/java/monasca/persister/configuration/VerticaMetricRepositoryConfiguration.java
index 604ca248..3e92e0c7 100644
--- a/src/main/java/com/hpcloud/mon/persister/configuration/VerticaMetricRepositoryConfiguration.java
+++ b/src/main/java/monasca/persister/configuration/VerticaMetricRepositoryConfiguration.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.configuration;
+package monasca.persister.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/AlarmStateTransitionConsumer.java b/src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumer.java
similarity index 90%
rename from src/main/java/com/hpcloud/mon/persister/consumer/AlarmStateTransitionConsumer.java
rename to src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumer.java
index cf95fae8..e9839fb9 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/AlarmStateTransitionConsumer.java
+++ b/src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumer.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
 import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
-import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
+import monasca.persister.pipeline.AlarmStateTransitionPipeline;
 
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/AlarmStateTransitionConsumerFactory.java b/src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumerFactory.java
similarity index 87%
rename from src/main/java/com/hpcloud/mon/persister/consumer/AlarmStateTransitionConsumerFactory.java
rename to src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumerFactory.java
index c57990d4..c650ebea 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/AlarmStateTransitionConsumerFactory.java
+++ b/src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumerFactory.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
-import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
+import monasca.persister.pipeline.AlarmStateTransitionPipeline;
 
 public interface AlarmStateTransitionConsumerFactory {
   AlarmStateTransitionConsumer create(KafkaAlarmStateTransitionConsumer kafkaConsumer,
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/Consumer.java b/src/main/java/monasca/persister/consumer/Consumer.java
similarity index 93%
rename from src/main/java/com/hpcloud/mon/persister/consumer/Consumer.java
rename to src/main/java/monasca/persister/consumer/Consumer.java
index 4f69934a..d6299464 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/Consumer.java
+++ b/src/main/java/monasca/persister/consumer/Consumer.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
-import com.hpcloud.mon.persister.pipeline.ManagedPipeline;
+import monasca.persister.pipeline.ManagedPipeline;
 
 import com.google.inject.Inject;
 
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumer.java b/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumer.java
similarity index 92%
rename from src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumer.java
rename to src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumer.java
index fad04a78..456493e8 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumer.java
+++ b/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumer.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
 import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
-import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
+import monasca.persister.pipeline.AlarmStateTransitionPipeline;
 
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerFactory.java b/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerFactory.java
similarity index 87%
rename from src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerFactory.java
rename to src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerFactory.java
index 2c2b554f..b187ee0b 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerFactory.java
+++ b/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerFactory.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
-import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
+import monasca.persister.pipeline.AlarmStateTransitionPipeline;
 
 public interface KafkaAlarmStateTransitionConsumerFactory {
   KafkaAlarmStateTransitionConsumer create(KafkaChannel kafkaChannel, int threadNum,
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java b/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java
similarity index 95%
rename from src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java
rename to src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java
index 7d415206..c1517440 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java
+++ b/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
 import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
-import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
+import monasca.persister.pipeline.AlarmStateTransitionPipeline;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasicFactory.java b/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasicFactory.java
similarity index 88%
rename from src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasicFactory.java
rename to src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasicFactory.java
index eebb2243..cbb97208 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasicFactory.java
+++ b/src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasicFactory.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
-import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
+import monasca.persister.pipeline.AlarmStateTransitionPipeline;
 
 public interface KafkaAlarmStateTransitionConsumerRunnableBasicFactory {
   KafkaAlarmStateTransitionConsumerRunnableBasic create(AlarmStateTransitionPipeline pipeline, KafkaChannel kafkaChannel,
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaChannel.java b/src/main/java/monasca/persister/consumer/KafkaChannel.java
similarity index 95%
rename from src/main/java/com/hpcloud/mon/persister/consumer/KafkaChannel.java
rename to src/main/java/monasca/persister/consumer/KafkaChannel.java
index 71618c27..b2947605 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaChannel.java
+++ b/src/main/java/monasca/persister/consumer/KafkaChannel.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
-import com.hpcloud.mon.persister.configuration.KafkaConfiguration;
-import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
-import com.hpcloud.mon.persister.configuration.PipelineConfiguration;
+import monasca.persister.configuration.KafkaConfiguration;
+import monasca.persister.configuration.MonPersisterConfiguration;
+import monasca.persister.configuration.PipelineConfiguration;
 
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaChannelFactory.java b/src/main/java/monasca/persister/consumer/KafkaChannelFactory.java
similarity index 81%
rename from src/main/java/com/hpcloud/mon/persister/consumer/KafkaChannelFactory.java
rename to src/main/java/monasca/persister/consumer/KafkaChannelFactory.java
index 35c568da..d47d6798 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaChannelFactory.java
+++ b/src/main/java/monasca/persister/consumer/KafkaChannelFactory.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
-import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
-import com.hpcloud.mon.persister.configuration.PipelineConfiguration;
+import monasca.persister.configuration.MonPersisterConfiguration;
+import monasca.persister.configuration.PipelineConfiguration;
 
 public interface KafkaChannelFactory {
   KafkaChannel create(MonPersisterConfiguration configuration,
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaConsumer.java b/src/main/java/monasca/persister/consumer/KafkaConsumer.java
similarity index 97%
rename from src/main/java/com/hpcloud/mon/persister/consumer/KafkaConsumer.java
rename to src/main/java/monasca/persister/consumer/KafkaConsumer.java
index d085f5a6..aca7c77a 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaConsumer.java
+++ b/src/main/java/monasca/persister/consumer/KafkaConsumer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaConsumerRunnableBasic.java b/src/main/java/monasca/persister/consumer/KafkaConsumerRunnableBasic.java
similarity index 95%
rename from src/main/java/com/hpcloud/mon/persister/consumer/KafkaConsumerRunnableBasic.java
rename to src/main/java/monasca/persister/consumer/KafkaConsumerRunnableBasic.java
index aa14655e..11d5907a 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaConsumerRunnableBasic.java
+++ b/src/main/java/monasca/persister/consumer/KafkaConsumerRunnableBasic.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
-import com.hpcloud.mon.persister.pipeline.ManagedPipeline;
+import monasca.persister.pipeline.ManagedPipeline;
 
 import kafka.consumer.ConsumerIterator;
 
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumer.java b/src/main/java/monasca/persister/consumer/KafkaMetricsConsumer.java
similarity index 93%
rename from src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumer.java
rename to src/main/java/monasca/persister/consumer/KafkaMetricsConsumer.java
index 7f88594f..4f90f3f1 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumer.java
+++ b/src/main/java/monasca/persister/consumer/KafkaMetricsConsumer.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
 import com.hpcloud.mon.common.model.metric.MetricEnvelope;
-import com.hpcloud.mon.persister.pipeline.MetricPipeline;
+import monasca.persister.pipeline.MetricPipeline;
 
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerFactory.java b/src/main/java/monasca/persister/consumer/KafkaMetricsConsumerFactory.java
similarity index 88%
rename from src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerFactory.java
rename to src/main/java/monasca/persister/consumer/KafkaMetricsConsumerFactory.java
index 630ec21d..f72078b1 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerFactory.java
+++ b/src/main/java/monasca/persister/consumer/KafkaMetricsConsumerFactory.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
-import com.hpcloud.mon.persister.pipeline.MetricPipeline;
+import monasca.persister.pipeline.MetricPipeline;
 
 public interface KafkaMetricsConsumerFactory {
   public KafkaMetricsConsumer create(KafkaChannel kafkaChannel, int threadNum,
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerRunnableBasic.java b/src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasic.java
similarity index 95%
rename from src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerRunnableBasic.java
rename to src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasic.java
index 960fcc11..ac24a239 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerRunnableBasic.java
+++ b/src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasic.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
 import com.hpcloud.mon.common.model.metric.MetricEnvelope;
-import com.hpcloud.mon.persister.pipeline.MetricPipeline;
+import monasca.persister.pipeline.MetricPipeline;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerRunnableBasicFactory.java b/src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasicFactory.java
similarity index 88%
rename from src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerRunnableBasicFactory.java
rename to src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasicFactory.java
index 83310f93..103d1dc6 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerRunnableBasicFactory.java
+++ b/src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasicFactory.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
-import com.hpcloud.mon.persister.pipeline.MetricPipeline;
+import monasca.persister.pipeline.MetricPipeline;
 
 public interface KafkaMetricsConsumerRunnableBasicFactory {
   KafkaMetricsConsumerRunnableBasic create(MetricPipeline pipeline, KafkaChannel kafkaChannel, int threadNumber);
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/MetricsConsumer.java b/src/main/java/monasca/persister/consumer/MetricsConsumer.java
similarity index 90%
rename from src/main/java/com/hpcloud/mon/persister/consumer/MetricsConsumer.java
rename to src/main/java/monasca/persister/consumer/MetricsConsumer.java
index 858e1252..357e8faf 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/MetricsConsumer.java
+++ b/src/main/java/monasca/persister/consumer/MetricsConsumer.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
 import com.hpcloud.mon.common.model.metric.MetricEnvelope;
-import com.hpcloud.mon.persister.pipeline.MetricPipeline;
+import monasca.persister.pipeline.MetricPipeline;
 
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/MetricsConsumerFactory.java b/src/main/java/monasca/persister/consumer/MetricsConsumerFactory.java
similarity index 88%
rename from src/main/java/com/hpcloud/mon/persister/consumer/MetricsConsumerFactory.java
rename to src/main/java/monasca/persister/consumer/MetricsConsumerFactory.java
index c8899cf0..a2f7e2ef 100644
--- a/src/main/java/com/hpcloud/mon/persister/consumer/MetricsConsumerFactory.java
+++ b/src/main/java/monasca/persister/consumer/MetricsConsumerFactory.java
@@ -12,9 +12,9 @@
  * the License.
  */
 
-package com.hpcloud.mon.persister.consumer;
+package monasca.persister.consumer;
 
-import com.hpcloud.mon.persister.pipeline.MetricPipeline;
+import monasca.persister.pipeline.MetricPipeline;
 
 public interface MetricsConsumerFactory {
   MetricsConsumer create(KafkaMetricsConsumer kafkaConsumer, MetricPipeline pipeline);
diff --git a/src/main/java/com/hpcloud/mon/persister/dbi/DBIProvider.java b/src/main/java/monasca/persister/dbi/DBIProvider.java
similarity index 92%
rename from src/main/java/com/hpcloud/mon/persister/dbi/DBIProvider.java
rename to src/main/java/monasca/persister/dbi/DBIProvider.java
index 315a83e3..d4880867 100644
--- a/src/main/java/com/hpcloud/mon/persister/dbi/DBIProvider.java
+++ b/src/main/java/monasca/persister/dbi/DBIProvider.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.dbi;
+package monasca.persister.dbi;
 
-import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
+import monasca.persister.configuration.MonPersisterConfiguration;
 
 import com.google.inject.ProvisionException;
 
diff --git a/src/main/java/com/hpcloud/mon/persister/healthcheck/SimpleHealthCheck.java b/src/main/java/monasca/persister/healthcheck/SimpleHealthCheck.java
similarity index 94%
rename from src/main/java/com/hpcloud/mon/persister/healthcheck/SimpleHealthCheck.java
rename to src/main/java/monasca/persister/healthcheck/SimpleHealthCheck.java
index 2980203e..51404d60 100644
--- a/src/main/java/com/hpcloud/mon/persister/healthcheck/SimpleHealthCheck.java
+++ b/src/main/java/monasca/persister/healthcheck/SimpleHealthCheck.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.healthcheck;
+package monasca.persister.healthcheck;
 
 import com.codahale.metrics.health.HealthCheck;
 
diff --git a/src/main/java/com/hpcloud/mon/persister/pipeline/AlarmStateTransitionPipeline.java b/src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipeline.java
similarity index 88%
rename from src/main/java/com/hpcloud/mon/persister/pipeline/AlarmStateTransitionPipeline.java
rename to src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipeline.java
index aa9c3bd9..39f2967b 100644
--- a/src/main/java/com/hpcloud/mon/persister/pipeline/AlarmStateTransitionPipeline.java
+++ b/src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipeline.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.pipeline;
+package monasca.persister.pipeline;
 
 import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
-import com.hpcloud.mon.persister.pipeline.event.AlarmStateTransitionedEventHandler;
+import monasca.persister.pipeline.event.AlarmStateTransitionedEventHandler;
 
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
diff --git a/src/main/java/com/hpcloud/mon/persister/pipeline/AlarmStateTransitionPipelineFactory.java b/src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipelineFactory.java
similarity index 85%
rename from src/main/java/com/hpcloud/mon/persister/pipeline/AlarmStateTransitionPipelineFactory.java
rename to src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipelineFactory.java
index ce3ca57c..1e9b8200 100644
--- a/src/main/java/com/hpcloud/mon/persister/pipeline/AlarmStateTransitionPipelineFactory.java
+++ b/src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipelineFactory.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.pipeline;
+package monasca.persister.pipeline;
 
-import com.hpcloud.mon.persister.pipeline.event.AlarmStateTransitionedEventHandler;
+import monasca.persister.pipeline.event.AlarmStateTransitionedEventHandler;
 
 public interface AlarmStateTransitionPipelineFactory {
   AlarmStateTransitionPipeline create(AlarmStateTransitionedEventHandler handler);
diff --git a/src/main/java/com/hpcloud/mon/persister/pipeline/ManagedPipeline.java b/src/main/java/monasca/persister/pipeline/ManagedPipeline.java
similarity index 91%
rename from src/main/java/com/hpcloud/mon/persister/pipeline/ManagedPipeline.java
rename to src/main/java/monasca/persister/pipeline/ManagedPipeline.java
index 336d0a99..bd28be47 100644
--- a/src/main/java/com/hpcloud/mon/persister/pipeline/ManagedPipeline.java
+++ b/src/main/java/monasca/persister/pipeline/ManagedPipeline.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.pipeline;
+package monasca.persister.pipeline;
 
-import com.hpcloud.mon.persister.pipeline.event.FlushableHandler;
+import monasca.persister.pipeline.event.FlushableHandler;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/hpcloud/mon/persister/pipeline/MetricPipeline.java b/src/main/java/monasca/persister/pipeline/MetricPipeline.java
similarity index 89%
rename from src/main/java/com/hpcloud/mon/persister/pipeline/MetricPipeline.java
rename to src/main/java/monasca/persister/pipeline/MetricPipeline.java
index 50b4fbb8..97d14021 100644
--- a/src/main/java/com/hpcloud/mon/persister/pipeline/MetricPipeline.java
+++ b/src/main/java/monasca/persister/pipeline/MetricPipeline.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.pipeline;
+package monasca.persister.pipeline;
 
 import com.hpcloud.mon.common.model.metric.MetricEnvelope;
-import com.hpcloud.mon.persister.pipeline.event.MetricHandler;
+import monasca.persister.pipeline.event.MetricHandler;
 
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
diff --git a/src/main/java/com/hpcloud/mon/persister/pipeline/MetricPipelineFactory.java b/src/main/java/monasca/persister/pipeline/MetricPipelineFactory.java
similarity index 87%
rename from src/main/java/com/hpcloud/mon/persister/pipeline/MetricPipelineFactory.java
rename to src/main/java/monasca/persister/pipeline/MetricPipelineFactory.java
index 94df9d21..713f3ba8 100644
--- a/src/main/java/com/hpcloud/mon/persister/pipeline/MetricPipelineFactory.java
+++ b/src/main/java/monasca/persister/pipeline/MetricPipelineFactory.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.pipeline;
+package monasca.persister.pipeline;
 
-import com.hpcloud.mon.persister.pipeline.event.MetricHandler;
+import monasca.persister.pipeline.event.MetricHandler;
 
 public interface MetricPipelineFactory {
   MetricPipeline create(MetricHandler metricHandler);
diff --git a/src/main/java/com/hpcloud/mon/persister/pipeline/event/AlarmStateTransitionedEventHandler.java b/src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandler.java
similarity index 91%
rename from src/main/java/com/hpcloud/mon/persister/pipeline/event/AlarmStateTransitionedEventHandler.java
rename to src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandler.java
index 21871647..b3ae627c 100644
--- a/src/main/java/com/hpcloud/mon/persister/pipeline/event/AlarmStateTransitionedEventHandler.java
+++ b/src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandler.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.pipeline.event;
+package monasca.persister.pipeline.event;
 
 import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
-import com.hpcloud.mon.persister.configuration.PipelineConfiguration;
-import com.hpcloud.mon.persister.repository.AlarmRepository;
+import monasca.persister.configuration.PipelineConfiguration;
+import monasca.persister.repository.AlarmRepository;
 
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
diff --git a/src/main/java/com/hpcloud/mon/persister/pipeline/event/AlarmStateTransitionedEventHandlerFactory.java b/src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandlerFactory.java
similarity index 88%
rename from src/main/java/com/hpcloud/mon/persister/pipeline/event/AlarmStateTransitionedEventHandlerFactory.java
rename to src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandlerFactory.java
index b08f785c..efb0d163 100644
--- a/src/main/java/com/hpcloud/mon/persister/pipeline/event/AlarmStateTransitionedEventHandlerFactory.java
+++ b/src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandlerFactory.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.pipeline.event;
+package monasca.persister.pipeline.event;
 
-import com.hpcloud.mon.persister.configuration.PipelineConfiguration;
+import monasca.persister.configuration.PipelineConfiguration;
 
 import com.google.inject.assistedinject.Assisted;
 
diff --git a/src/main/java/com/hpcloud/mon/persister/pipeline/event/FlushableHandler.java b/src/main/java/monasca/persister/pipeline/event/FlushableHandler.java
similarity index 96%
rename from src/main/java/com/hpcloud/mon/persister/pipeline/event/FlushableHandler.java
rename to src/main/java/monasca/persister/pipeline/event/FlushableHandler.java
index 675e76a8..bcdce7c9 100644
--- a/src/main/java/com/hpcloud/mon/persister/pipeline/event/FlushableHandler.java
+++ b/src/main/java/monasca/persister/pipeline/event/FlushableHandler.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.pipeline.event;
+package monasca.persister.pipeline.event;
 
-import com.hpcloud.mon.persister.configuration.PipelineConfiguration;
+import monasca.persister.configuration.PipelineConfiguration;
 
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.Timer;
diff --git a/src/main/java/com/hpcloud/mon/persister/pipeline/event/MetricHandler.java b/src/main/java/monasca/persister/pipeline/event/MetricHandler.java
similarity index 96%
rename from src/main/java/com/hpcloud/mon/persister/pipeline/event/MetricHandler.java
rename to src/main/java/monasca/persister/pipeline/event/MetricHandler.java
index 60792979..b7c9b111 100644
--- a/src/main/java/com/hpcloud/mon/persister/pipeline/event/MetricHandler.java
+++ b/src/main/java/monasca/persister/pipeline/event/MetricHandler.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.pipeline.event;
+package monasca.persister.pipeline.event;
 
-import static com.hpcloud.mon.persister.repository.VerticaMetricsConstants.MAX_COLUMN_LENGTH;
+import static monasca.persister.repository.VerticaMetricsConstants.MAX_COLUMN_LENGTH;
 
 import com.hpcloud.mon.common.model.metric.Metric;
 import com.hpcloud.mon.common.model.metric.MetricEnvelope;
-import com.hpcloud.mon.persister.configuration.PipelineConfiguration;
-import com.hpcloud.mon.persister.repository.MetricRepository;
-import com.hpcloud.mon.persister.repository.Sha1HashId;
+import monasca.persister.configuration.PipelineConfiguration;
+import monasca.persister.repository.MetricRepository;
+import monasca.persister.repository.Sha1HashId;
 
 import com.codahale.metrics.Counter;
 import com.google.inject.Inject;
diff --git a/src/main/java/com/hpcloud/mon/persister/pipeline/event/MetricHandlerFactory.java b/src/main/java/monasca/persister/pipeline/event/MetricHandlerFactory.java
similarity index 87%
rename from src/main/java/com/hpcloud/mon/persister/pipeline/event/MetricHandlerFactory.java
rename to src/main/java/monasca/persister/pipeline/event/MetricHandlerFactory.java
index b9b42461..34e6c9f3 100644
--- a/src/main/java/com/hpcloud/mon/persister/pipeline/event/MetricHandlerFactory.java
+++ b/src/main/java/monasca/persister/pipeline/event/MetricHandlerFactory.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.pipeline.event;
+package monasca.persister.pipeline.event;
 
-import com.hpcloud.mon.persister.configuration.PipelineConfiguration;
+import monasca.persister.configuration.PipelineConfiguration;
 
 import com.google.inject.assistedinject.Assisted;
 
diff --git a/src/main/java/com/hpcloud/mon/persister/repository/AlarmRepository.java b/src/main/java/monasca/persister/repository/AlarmRepository.java
similarity index 94%
rename from src/main/java/com/hpcloud/mon/persister/repository/AlarmRepository.java
rename to src/main/java/monasca/persister/repository/AlarmRepository.java
index 80311942..762fbf00 100644
--- a/src/main/java/com/hpcloud/mon/persister/repository/AlarmRepository.java
+++ b/src/main/java/monasca/persister/repository/AlarmRepository.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.repository;
+package monasca.persister.repository;
 
 import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
 
diff --git a/src/main/java/com/hpcloud/mon/persister/repository/InfluxDBAlarmRepository.java b/src/main/java/monasca/persister/repository/InfluxDBAlarmRepository.java
similarity index 97%
rename from src/main/java/com/hpcloud/mon/persister/repository/InfluxDBAlarmRepository.java
rename to src/main/java/monasca/persister/repository/InfluxDBAlarmRepository.java
index cc1a70ef..d8f74224 100644
--- a/src/main/java/com/hpcloud/mon/persister/repository/InfluxDBAlarmRepository.java
+++ b/src/main/java/monasca/persister/repository/InfluxDBAlarmRepository.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.repository;
+package monasca.persister.repository;
 
 import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
-import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
+import monasca.persister.configuration.MonPersisterConfiguration;
 
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.Timer;
diff --git a/src/main/java/com/hpcloud/mon/persister/repository/InfluxDBMetricRepository.java b/src/main/java/monasca/persister/repository/InfluxDBMetricRepository.java
similarity index 99%
rename from src/main/java/com/hpcloud/mon/persister/repository/InfluxDBMetricRepository.java
rename to src/main/java/monasca/persister/repository/InfluxDBMetricRepository.java
index 8584244b..6199a73c 100644
--- a/src/main/java/com/hpcloud/mon/persister/repository/InfluxDBMetricRepository.java
+++ b/src/main/java/monasca/persister/repository/InfluxDBMetricRepository.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.repository;
+package monasca.persister.repository;
 
-import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
+import monasca.persister.configuration.MonPersisterConfiguration;
 
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.Timer;
diff --git a/src/main/java/com/hpcloud/mon/persister/repository/InfluxRepository.java b/src/main/java/monasca/persister/repository/InfluxRepository.java
similarity index 95%
rename from src/main/java/com/hpcloud/mon/persister/repository/InfluxRepository.java
rename to src/main/java/monasca/persister/repository/InfluxRepository.java
index 219189e0..12e69f50 100644
--- a/src/main/java/com/hpcloud/mon/persister/repository/InfluxRepository.java
+++ b/src/main/java/monasca/persister/repository/InfluxRepository.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.repository;
+package monasca.persister.repository;
 
-import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
+import monasca.persister.configuration.MonPersisterConfiguration;
 
 import io.dropwizard.setup.Environment;
 
diff --git a/src/main/java/com/hpcloud/mon/persister/repository/MetricRepository.java b/src/main/java/monasca/persister/repository/MetricRepository.java
similarity index 95%
rename from src/main/java/com/hpcloud/mon/persister/repository/MetricRepository.java
rename to src/main/java/monasca/persister/repository/MetricRepository.java
index d077ad3b..7e1e9e35 100644
--- a/src/main/java/com/hpcloud/mon/persister/repository/MetricRepository.java
+++ b/src/main/java/monasca/persister/repository/MetricRepository.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.repository;
+package monasca.persister.repository;
 
 public interface MetricRepository {
   void addMetricToBatch(Sha1HashId defDimsId, String timeStamp, double value);
diff --git a/src/main/java/com/hpcloud/mon/persister/repository/Sha1HashId.java b/src/main/java/monasca/persister/repository/Sha1HashId.java
similarity index 96%
rename from src/main/java/com/hpcloud/mon/persister/repository/Sha1HashId.java
rename to src/main/java/monasca/persister/repository/Sha1HashId.java
index 28718b54..392906f9 100644
--- a/src/main/java/com/hpcloud/mon/persister/repository/Sha1HashId.java
+++ b/src/main/java/monasca/persister/repository/Sha1HashId.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.repository;
+package monasca.persister.repository;
 
 import org.apache.commons.codec.binary.Hex;
 
diff --git a/src/main/java/com/hpcloud/mon/persister/repository/VerticaAlarmRepository.java b/src/main/java/monasca/persister/repository/VerticaAlarmRepository.java
similarity index 96%
rename from src/main/java/com/hpcloud/mon/persister/repository/VerticaAlarmRepository.java
rename to src/main/java/monasca/persister/repository/VerticaAlarmRepository.java
index 73f0e50f..83b175f7 100644
--- a/src/main/java/com/hpcloud/mon/persister/repository/VerticaAlarmRepository.java
+++ b/src/main/java/monasca/persister/repository/VerticaAlarmRepository.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.repository;
+package monasca.persister.repository;
 
 import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
-import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
+import monasca.persister.configuration.MonPersisterConfiguration;
 
 import com.codahale.metrics.Timer;
 
diff --git a/src/main/java/com/hpcloud/mon/persister/repository/VerticaMetricRepository.java b/src/main/java/monasca/persister/repository/VerticaMetricRepository.java
similarity index 99%
rename from src/main/java/com/hpcloud/mon/persister/repository/VerticaMetricRepository.java
rename to src/main/java/monasca/persister/repository/VerticaMetricRepository.java
index 7d3a4d13..d771f3a2 100644
--- a/src/main/java/com/hpcloud/mon/persister/repository/VerticaMetricRepository.java
+++ b/src/main/java/monasca/persister/repository/VerticaMetricRepository.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.repository;
+package monasca.persister.repository;
 
-import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
+import monasca.persister.configuration.MonPersisterConfiguration;
 
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.Timer;
diff --git a/src/main/java/com/hpcloud/mon/persister/repository/VerticaMetricsConstants.java b/src/main/java/monasca/persister/repository/VerticaMetricsConstants.java
similarity index 94%
rename from src/main/java/com/hpcloud/mon/persister/repository/VerticaMetricsConstants.java
rename to src/main/java/monasca/persister/repository/VerticaMetricsConstants.java
index 4bc51359..7ba665d8 100644
--- a/src/main/java/com/hpcloud/mon/persister/repository/VerticaMetricsConstants.java
+++ b/src/main/java/monasca/persister/repository/VerticaMetricsConstants.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.repository;
+package monasca.persister.repository;
 
 public final class VerticaMetricsConstants {
   public static final int MAX_COLUMN_LENGTH = 255;
diff --git a/src/main/java/com/hpcloud/mon/persister/repository/VerticaRepository.java b/src/main/java/monasca/persister/repository/VerticaRepository.java
similarity index 95%
rename from src/main/java/com/hpcloud/mon/persister/repository/VerticaRepository.java
rename to src/main/java/monasca/persister/repository/VerticaRepository.java
index 2919755e..63e419e9 100644
--- a/src/main/java/com/hpcloud/mon/persister/repository/VerticaRepository.java
+++ b/src/main/java/monasca/persister/repository/VerticaRepository.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.repository;
+package monasca.persister.repository;
 
 import org.skife.jdbi.v2.DBI;
 import org.skife.jdbi.v2.Handle;
diff --git a/src/main/java/com/hpcloud/mon/persister/resource/PlaceHolder.java b/src/main/java/monasca/persister/resource/PlaceHolder.java
similarity index 96%
rename from src/main/java/com/hpcloud/mon/persister/resource/PlaceHolder.java
rename to src/main/java/monasca/persister/resource/PlaceHolder.java
index 44045f9c..f45a5a20 100644
--- a/src/main/java/com/hpcloud/mon/persister/resource/PlaceHolder.java
+++ b/src/main/java/monasca/persister/resource/PlaceHolder.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister.resource;
+package monasca.persister.resource;
 
 public class PlaceHolder {
   private final String content;
diff --git a/src/main/java/com/hpcloud/mon/persister/resource/Resource.java b/src/main/java/monasca/persister/resource/Resource.java
similarity index 96%
rename from src/main/java/com/hpcloud/mon/persister/resource/Resource.java
rename to src/main/java/monasca/persister/resource/Resource.java
index 896b24e1..74f60744 100644
--- a/src/main/java/com/hpcloud/mon/persister/resource/Resource.java
+++ b/src/main/java/monasca/persister/resource/Resource.java
@@ -15,7 +15,7 @@
  * the License.
  */
 
-package com.hpcloud.mon.persister.resource;
+package monasca.persister.resource;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
diff --git a/src/main/resources/mon-persister-config.yml b/src/main/resources/persister-config.yml
similarity index 88%
rename from src/main/resources/mon-persister-config.yml
rename to src/main/resources/persister-config.yml
index 69b0a9ec..11a87228 100644
--- a/src/main/resources/mon-persister-config.yml
+++ b/src/main/resources/persister-config.yml
@@ -1,4 +1,4 @@
-name: mon-persister
+name: monasca-persister
 
 alarmHistoryConfiguration:
   batchSize: 100
@@ -57,7 +57,7 @@ influxDbConfiguration:
 
 #dataSourceFactory:
 #  driverClass: com.vertica.jdbc.Driver
-##  url: jdbc:vertica://mon-aw1rdd1-vertica0001.rndd.aw1.hpcloud.net:5433/som
+##  url: jdbc:vertica://mini-mon:5433/monasca
 #  # my Vertica DB in the cloud
 #  #url: jdbc:vertica://15.185.94.245:5433/som
 #  url: jdbc:vertica://192.168.10.4:5433/mon
@@ -100,8 +100,8 @@ logging:
 
     # Sets the level for 'com.example.app' to DEBUG.
     com.example.app: DEBUG
-    com.hpcloud: debug
-#    com.hpcloud.mon.persister.repository: DEBUG
+    monasca: DEBUG
+#    monasca.persister.repository: DEBUG
 
   appenders:
     - type: console
@@ -112,18 +112,18 @@ logging:
     - type: file
       threshold: DEBUG
       archive: true
-      currentLogFilename: ./logs/mon-persister.log
-      archivedLogFilenamePattern: ./logs/mon-persister-%d.log.gz
+      currentLogFilename: ./logs/monasca-persister.log
+      archivedLogFilenamePattern: ./logs/monasca-persister-%d.log.gz
       archivedFileCount: 5
 
     - type: file
       # The file to which current statements will be logged.
-      currentLogFilename: ./logs/mon-persister.log
+      currentLogFilename: ./logs/monasca-persister.log
 
       # When the log file rotates, the archived log will be renamed to this and gzipped. The
       # %d is replaced with the previous day (yyyy-MM-dd). Custom rolling windows can be created
       # by passing a SimpleDateFormat-compatible format as an argument: "%d{yyyy-MM-dd-hh}".
-      archivedLogFilenamePattern: ./logs/mon-persister-%d.log.gz
+      archivedLogFilenamePattern: ./logs/monasca-persister-%d.log.gz
 
       # The number of archived files to keep.
       archivedFileCount: 5
diff --git a/src/test/java/com/hpcloud/mon/persister/MonPersisterConsumerTest.java b/src/test/java/monasca/persister/MonPersisterConsumerTest.java
similarity index 83%
rename from src/test/java/com/hpcloud/mon/persister/MonPersisterConsumerTest.java
rename to src/test/java/monasca/persister/MonPersisterConsumerTest.java
index feacff23..d8fe77d8 100644
--- a/src/test/java/com/hpcloud/mon/persister/MonPersisterConsumerTest.java
+++ b/src/test/java/monasca/persister/MonPersisterConsumerTest.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package com.hpcloud.mon.persister;
+package monasca.persister;
 
-import com.hpcloud.mon.persister.consumer.KafkaMetricsConsumer;
-import com.hpcloud.mon.persister.consumer.MetricsConsumer;
-import com.hpcloud.mon.persister.pipeline.MetricPipeline;
-import com.hpcloud.mon.persister.pipeline.event.MetricHandler;
+import monasca.persister.consumer.KafkaMetricsConsumer;
+import monasca.persister.consumer.MetricsConsumer;
+import monasca.persister.pipeline.MetricPipeline;
+import monasca.persister.pipeline.event.MetricHandler;
 
 import org.junit.Before;
 import org.junit.Test;