diff --git a/build/build_rpms b/build/build_rpms
index 26bce88e9..f3df7d625 100755
--- a/build/build_rpms
+++ b/build/build_rpms
@@ -45,7 +45,7 @@ fi
 . ./build/releasenum
 
 # make the install package
-buildroot=$HOME/rpm/BUILD/columnstore-$version-$release
+buildroot=$HOME/rpm/BUILD/mariadb-columnstore-$version-$release
 
 rm -rf $buildroot
 mkdir -p $buildroot
diff --git a/build/columnstore.spec.in b/build/columnstore.spec.in
index a0d6c6ed5..08d240365 100644
--- a/build/columnstore.spec.in
+++ b/build/columnstore.spec.in
@@ -2,7 +2,7 @@
 # $Id$
 #
 Summary: MariaDB-Columnstore software
-Name: columnstore
+Name: mariadb-columnstore
 @@VERSION@@
 @@RELEASE@@
 Vendor: MariaDB, Inc.