diff --git a/build/bootstrap b/build/bootstrap
index 4079c926c..52e736dba 100755
--- a/build/bootstrap
+++ b/build/bootstrap
@@ -15,10 +15,10 @@ cp build/gdb export/bin
 cp build/libgcc_s.so.1 export/lib 
 cp build/libstdc++.so.6.0.14 export/lib
 
-cp build/files.lst $HOME/MariaDB_InfiniDB/export/mysql/.
-cp dbcon/mysql/install_calpont_mysql.sh $HOME/MariaDB_InfiniDB/export/mysql/.
-cp dbcon/mysql/my.cnf $HOME/MariaDB_InfiniDB/export/mysql/.
-cp dbcon/mysql/mysql-Columnstore $HOME/MariaDB_InfiniDB/export/mysql/.
+cp build/files.lst $HOME/mariadb-columnstore-server/export/mysql/.
+cp dbcon/mysql/install_calpont_mysql.sh $HOME/mariadb-columnstore-server/export/mysql/.
+cp dbcon/mysql/my.cnf $HOME/mariadb-columnstore-server/export/mysql/.
+cp dbcon/mysql/mysql-Columnstore $HOME/mariadb-columnstore-server/export/mysql/.
 
 if [ ! $$ ]; then
     exit 1
diff --git a/build/build_rpms b/build/build_rpms
index ea754432c..34511dc0e 100755
--- a/build/build_rpms
+++ b/build/build_rpms
@@ -4,7 +4,7 @@
 #
 
 verbose=0
-mysqldir=$HOME/MariaDB_InfiniDB/export/mysql
+mysqldir=$HOME/mariadb-columnstore-server/export/mysql
 
 usage()
 {
diff --git a/dbcon/joblist/Makefile b/dbcon/joblist/Makefile
index f7dcec12f..1f7d17a9c 100755
--- a/dbcon/joblist/Makefile
+++ b/dbcon/joblist/Makefile
@@ -11,7 +11,7 @@ PROGRAM=libjoblist.so
 VERSION=1.0.0
 LIBRARY=$(PROGRAM).$(VERSION)
 
-MYSQL_DIR=../../MariaDB_InfiniDB
+MYSQL_DIR=../../mariadb-columnstore-server
 CPPFLAGS+= -I. -I$(EXPORT_ROOT)/include -I$(MYSQL_DIR)/include -I/usr/include/libxml2
 CXXFLAGS+=$(DEBUG_FLAGS) -Wall -fpic -fno-strict-aliasing $(JL_DEBUG_FLAGS)
 #CXXFLAGS+=-DFIFO_SINK
diff --git a/dbcon/mysql/Makefile b/dbcon/mysql/Makefile
index 49e4c0e94..c93fcae89 100755
--- a/dbcon/mysql/Makefile
+++ b/dbcon/mysql/Makefile
@@ -7,7 +7,7 @@ include ../../rules.mak
 #*****************************************************************************************/
 .PHONY: install clean test docs coverage leakcheck
 
-MYSQL_DIR=../../../MariaDB_InfiniDB
+MYSQL_DIR=../../../mariadb-columnstore-server
 #MYSQL_DIR=../../../mariadb
 #MYSQL_DIR=../../../InfiniDB-MySQL
 
diff --git a/utils/mysqlcl_idb/Makefile b/utils/mysqlcl_idb/Makefile
index 00940ba17..3ab2dfb94 100755
--- a/utils/mysqlcl_idb/Makefile
+++ b/utils/mysqlcl_idb/Makefile
@@ -7,7 +7,7 @@
 include ../../rules.mak
 .PHONY: install clean test docs coverage leakcheck
 
-MYSQL_DIR=../../MariaDB_InfiniDB
+MYSQL_DIR=../../mariadb-columnstore-server
 
 PROGRAM=libmysqlcl_idb.so
 VERSION=1.0.0
diff --git a/utils/querystats/Makefile b/utils/querystats/Makefile
index 7ae668911..ffc789793 100755
--- a/utils/querystats/Makefile
+++ b/utils/querystats/Makefile
@@ -11,7 +11,7 @@ PROGRAM=libquerystats.so
 VERSION=1.0.0
 LIBRARY=$(PROGRAM).$(VERSION)
 
-MYSQL_DIR=../../MariaDB_InfiniDB
+MYSQL_DIR=../../mariadb-columnstore-server
 CPPFLAGS=-I$(EXPORT_ROOT)/include -I/usr/include/libxml2 -I$(MYSQL_DIR)/include
 CXXFLAGS+=$(DEBUG_FLAGS) -Wall -fpic
 
diff --git a/utils/udfsdk/Makefile b/utils/udfsdk/Makefile
index a9997ef6e..011154ac6 100755
--- a/utils/udfsdk/Makefile
+++ b/utils/udfsdk/Makefile
@@ -6,7 +6,7 @@
 #*****************************************************************************************/
 include ../../rules.mak
 .PHONY: install clean test docs coverage leakcheck
-MYSQL_DIR=../../../MariaDB_InfiniDB
+MYSQL_DIR=../../../mariadb-columnstore-server
 
 PROGRAM1=libudf_mysql.so
 VERSION1=1.0.0