diff --git a/oam/install_scripts/columnstoreSyslog-ng b/oam/install_scripts/columnstoreSyslog-ng
index c4d30e3e0..8dead4b04 100755
--- a/oam/install_scripts/columnstoreSyslog-ng
+++ b/oam/install_scripts/columnstoreSyslog-ng
@@ -1,6 +1,6 @@
-# Calpont Database Platform Logging
+# MariaDB Columnstore Database Platform Logging
 
-source s_infinidb {
+source s_columnstore {
         # message generated by Syslog-NG
         internal();
         # standard Linux log source (this is the default place for the syslog()
@@ -45,33 +45,33 @@ destination d_data_mods{
 };
 
 log{
-        source(s_infinidb);
+        source(s_columnstore);
         filter(f_local1crit);
         destination(d_crit);
 };
 
 log{        
-	source(s_infinidb);        
+	source(s_columnstore);        
 	filter(f_local1err);        
 	destination(d_err);
 };
 log{        
-	source(s_infinidb);        
+	source(s_columnstore);        
 	filter(f_local1warning);        
 	destination(d_warning);
 };
 log{        
-	source(s_infinidb);        
+	source(s_columnstore);        
 	filter(f_local1info);        
 	destination(d_info);
 };
 log{        
-	source(s_infinidb);        
+	source(s_columnstore);        
 	filter(f_local1debug);        
 	destination(d_debug);
 };
 log{        
-	source(s_infinidb);        
+	source(s_columnstore);        
 	filter(f_local2crit);        
 	destination(d_data_mods);
 };
diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install
index a126601c7..cbcb05e32 100755
--- a/oam/install_scripts/post-install
+++ b/oam/install_scripts/post-install
@@ -38,7 +38,7 @@ if [ $installdir != "/usr/local/MariaDB/Columnstore" ]; then
 	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib
 else
 	# add library config file
-	/bin/cp -f $installdir/bin/infinidb.conf /etc/ld.so.conf.d/.
+	/bin/cp -f $installdir/bin/columnstore.conf /etc/ld.so.conf.d/.
 	ldconfig
 fi
 
@@ -128,8 +128,8 @@ mkdir -p $installdir/data/bulk/tmpjob >/dev/null 2>&1
 rm -f $installdir/data/bulk/tmpjob/* >/dev/null 2>&1
 chmod -R 755 $installdir/data/bulk >/dev/null 2>&1
 
-#create infinidb temp file directory
-mkdir -p /tmp/infinidb_tmp_files >/dev/null 2>&1
+#create columnstore temp file directory
+mkdir -p /tmp/columnstore_tmp_files >/dev/null 2>&1
 
 #setup core file directory and link
 mkdir /var/log/Columnstore/corefiles > /dev/null 2>&1
@@ -142,29 +142,29 @@ mkdir /var/log/Columnstore/data/archive > /dev/null 2>&1
 # install Calpont Log Rotate File
 test -d $installdir/mysql/db || mkdir -p $installdir/mysql/db
 cp $installdir/bin/columnstoreLogRotate /etc/logrotate.d/columnstore > /dev/null 2>&1
-rm -rf $installdir/mysql/db/infinidb_log_archive > /dev/null 2>&1
+rm -rf $installdir/mysql/db/columnstore_log_archive > /dev/null 2>&1
 
 # delete Calpont shared memory segments
 $installdir/bin/Calpont/bin/clearShm  > /dev/null 2>&1
 
-#setup the infinidb service script
-rm -f /etc/init.d/infinidb >/dev/null 2>&1
-cp $installdir/bin/infinidb /etc/init.d >/dev/null 2>&1
+#setup the columnstore service script
+rm -f /etc/init.d/columnstore >/dev/null 2>&1
+cp $installdir/bin/columnstore /etc/init.d >/dev/null 2>&1
 if [ -x /sbin/chkconfig ]; then
-	/sbin/chkconfig --add infinidb > /dev/null 2>&1
-	/sbin/chkconfig infinidb on > /dev/null 2>&1
+	/sbin/chkconfig --add columnstore > /dev/null 2>&1
+	/sbin/chkconfig columnstore on > /dev/null 2>&1
 elif [ -x /usr/sbin/update-rc.d ]; then
-	/usr/sbin/update-rc.d infinidb defaults 99 > /dev/null 2>&1
+	/usr/sbin/update-rc.d columnstore defaults 99 > /dev/null 2>&1
 else
 	echo ""
-	echo "Package 'chkconfig' or 'update-rc.d' not installed, contact your sysadmin if you want to setup to autostart for infinidb"	
+	echo "Package 'chkconfig' or 'update-rc.d' not installed, contact your sysadmin if you want to setup to autostart for columnstore"	
 fi
 
 #setup InfiniDB system logging
 if [ $user = "root" ]; then
 	$installdir/bin/syslogSetup.sh install > /tmp/syslog_install.log 2>&1
 	chmod 777 -R /dev/shm
-	rm -f /etc/default/infinidb
+	rm -f /etc/default/columnstore
 else
 	sudo $installdir/bin/syslogSetup.sh --installdir=$installdir install > /tmp/syslog_install.log 2>&1
 	sudo chown $user:$user $installdir/etc/Calpont.xml
@@ -174,8 +174,8 @@ else
 	sudo rm -f /var/lock/subsys/mysql-Columnstore
 	sudo rm -f /tmp/StopCalpont
 
-	sed -i -e s@/usr/local/MariaDB/Columnstore@$installdir@g $installdir/bin/infinidb.def
-	sudo cp $installdir/bin/infinidb.def /etc/default/infinidb
+	sed -i -e s@/usr/local/MariaDB/Columnstore@$installdir@g $installdir/bin/columnstore.def
+	sudo cp $installdir/bin/columnstore.def /etc/default/columnstore
 fi
 
 #check if InfiniDB system logging was setup
diff --git a/oam/install_scripts/pre-uninstall b/oam/install_scripts/pre-uninstall
index ba4a8616a..87c7ecb23 100755
--- a/oam/install_scripts/pre-uninstall
+++ b/oam/install_scripts/pre-uninstall
@@ -1,4 +1,4 @@
-#!/bin/bash
+!/bin/bash
 #
 # $Id: post-uninstall 421 2007-04-05 15:46:55Z dhill $
 #
@@ -34,14 +34,14 @@ for arg in "$@"; do
 done
 
 #stop services
-$installdir/bin/infinidb stop > /dev/null 2>&1
+$installdir/bin/columnstore stop > /dev/null 2>&1
 if test -f /etc/init.d/columnstore-Mysql ; then
 	$installdir/myql/columnstore-Mysql stop > /dev/null 2>&1
 fi
 
 if [ $installdir == "/usr/local/MariaDB/Columnstore" ]; then
 	# remove library config file
-	rm -f /etc/ld.so.conf.d/infinidb.conf
+	rm -f /etc/ld.so.conf.d/columnstore.conf
 	rm -f /etc/ld.so.cache
 	ldconfig
 fi
@@ -76,8 +76,8 @@ fi
 #rm -f $installdir/mysql/db/*.err > /dev/null 2>&1
 rm -f /var/log/Columnstore/activeAlarms > /dev/null 2>&1
 rm -f /var/log/Columnstore/*.log1 > /dev/null 2>&1
-rm -rf $installdir/mysql/db/infinidb_log_archive > /dev/null 2>&1
-sudo rm -f /etc/default/infinidb
+rm -rf $installdir/mysql/db/columnstore_log_archive > /dev/null 2>&1
+sudo rm -f /etc/default/columnstore
 
 # remove Calpont Log Rotate File abd Transaction Log File
 rm -f /etc/logrotate.d/columnstore > /dev/null 2>&1
@@ -100,12 +100,12 @@ rm -rf /tmp/bucketreuse
 rm -f /tmp/columnstore.txt
 rm -f /tmp/dbbuilder.*
 rm -f /tmp/dbrmfiles
-rm -f /var/lock/subsys/infinidb
+rm -f /var/lock/subsys/columnstore
 rm -f /tmp/pkgcheck
 rm -f /tmp/upgrade-status.log.*
 rm -f /tmp/mount.log
 rm -f $installdir/data/bulk/tmpjob/* >/dev/null 2>&1
-rm -rf /tmp/infinidb_tmp_files
+rm -rf /tmp/columnstore_tmp_files
 rm -f $installdir/local/moveDbrootTransactionLog
 
 #delete any old setenv files under home directory
@@ -122,17 +122,17 @@ fi
 if [ -x $installdir/bin/syslogSetup.sh ]; then
 	if [ $user = "root" ]; then
 		$installdir/bin/syslogSetup.sh uninstall >/dev/null 2>&1
-		rm -f /etc/init.d/infinidb > /dev/null 2>&1
+		rm -f /etc/init.d/columnstore > /dev/null 2>&1
 	else
 		sudo $installdir/bin/syslogSetup.sh uninstall >/dev/null 2>&1
 	fi
 fi
 
 if [ -x /sbin/chkconfig ]; then
-	/sbin/chkconfig infinidb off > /dev/null 2>&1
-	/sbin/chkconfig --del infinidb > /dev/null 2>&1
+	/sbin/chkconfig columnstore off > /dev/null 2>&1
+	/sbin/chkconfig --del columnstore > /dev/null 2>&1
 elif [ -x /usr/sbin/update-rc.d ]; then
-	/usr/sbin/update-rc.d -f infinidb remove > /dev/null 2>&1
+	/usr/sbin/update-rc.d -f columnstore remove > /dev/null 2>&1
 fi
 
 if [ $quiet != 1 ]; then