diff --git a/asterix-yarn/src/main/resources/configs/asterix-client-log4j.properties b/asterix-yarn/src/main/resources/configs/asterix-client-log4j.properties
index 4b936b5..0f7f494 100644
--- a/asterix-yarn/src/main/resources/configs/asterix-client-log4j.properties
+++ b/asterix-yarn/src/main/resources/configs/asterix-client-log4j.properties
@@ -19,5 +19,5 @@
 # Print the date in ISO 8601 format
 log4j.appender.A1.layout.ConversionPattern=%-p: %m%n
 
-log4j.logger.edu.uci.ics.asterix.event.management=info
+log4j.logger.org.apache.asterix.event.management=info
 log4j.logger.org.apache.zookeeper=info
diff --git a/asterix-yarn/src/main/resources/scripts/asterix b/asterix-yarn/src/main/resources/scripts/asterix
index c2fc20f..4acc431 100644
--- a/asterix-yarn/src/main/resources/scripts/asterix
+++ b/asterix-yarn/src/main/resources/scripts/asterix
@@ -21,5 +21,5 @@
 ASTERIX_CLASSPATH=$ASTERIX_CLASSPATH:$YARN_CONF_DIR:$HADOOP_CONF_DIR:$HADOOP_CONF_PATH
 pushd $(dirname $0) > /dev/null
 cd $ASTERIX_HOME
-java $JAVA_OPTS -cp $ASTERIX_CLASSPATH -Dlog4j.configuration=file://$ASTERIX_HOME/conf/asterix-client-log4j.properties edu.uci.ics.asterix.aoya.AsterixYARNClient $@
+java $JAVA_OPTS -cp $ASTERIX_CLASSPATH -Dlog4j.configuration=file://$ASTERIX_HOME/conf/asterix-client-log4j.properties org.apache.asterix.aoya.AsterixYARNClient $@
 popd > /dev/null
diff --git a/asterix-yarn/src/main/resources/scripts/asterix.cmd b/asterix-yarn/src/main/resources/scripts/asterix.cmd
index a85e411..e60e09c 100644
--- a/asterix-yarn/src/main/resources/scripts/asterix.cmd
+++ b/asterix-yarn/src/main/resources/scripts/asterix.cmd
@@ -31,7 +31,7 @@
 
 :main
 
-  set CLASS=edu.uci.ics.asterix.aoya.AsterixYARNClient
+  set CLASS=org.apache.asterix.aoya.AsterixYARNClient
 
   @rem JAVA and JAVA_HEAP_MAX and set in hadoop-config.cmd