diff --git a/Makefile b/Makefile
index 9cf1202..2cbdca6 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,8 @@ SHARED_BASE = \
 	data/pacman-multilib.conf \
 	data/pacman-mirrors.conf
 
-SETS_PKG = \
-	data/pkg.d/default.set
+LIST_PKG = \
+	data/pkg.list.d/default.list
 
 ARCH_CONF = \
 	data/make.conf.d/i686.conf \
@@ -55,12 +55,12 @@ SHARED_PKG = \
 	data/makepkg.conf \
 	data/base-devel-udev
 
-SETS_ISO = \
-	data/iso.d/default.set \
-	data/iso.d/official.set \
-	data/iso.d/community.set \
-	data/iso.d/minimal.set \
-	data/iso.d/sonar.set
+LIST_ISO = \
+	data/iso.list.d/default.list \
+	data/iso.list.d/official.list \
+	data/iso.list.d/community.list \
+	data/iso.list.d/minimal.list \
+	data/iso.list.d/sonar.list
 
 BIN_ISO = \
 	bin/buildiso \
@@ -140,8 +140,8 @@ install_base:
 	install -m0644 ${SHARED_BASE} $(DESTDIR)$(PREFIX)/share/manjaro-tools
 
 install_pkg:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.d
-	install -m0644 ${SETS_PKG} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.d
+	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.list.d
+	install -m0644 ${LIST_PKG} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.list.d
 
 	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/make.conf.d
 	install -m0644 ${ARCH_CONF} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/make.conf.d
@@ -162,8 +162,8 @@ install_pkg:
 	gzip -c man/buildtree.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildtree.1.gz
 
 install_iso:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.d
-	install -m0644 ${SETS_ISO} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.d
+	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.list.d
+	install -m0644 ${LIST_ISO} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.list.d
 
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
 	install -m0755 ${BIN_ISO} $(DESTDIR)$(PREFIX)/bin
@@ -195,7 +195,7 @@ uninstall_base:
 	for f in ${LIBS_BASE}; do rm -f $(DESTDIR)$(PREFIX)/lib/manjaro-tools/$$f; done
 
 uninstall_pkg:
-	for f in ${SETS_PKG}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.d/$$f; done
+	for f in ${LIST_PKG}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.list.d/$$f; done
 	for f in ${ARCH_CONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/make.conf.d/$$f; done
 	for f in ${BIN_PKG}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
 	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
@@ -205,7 +205,7 @@ uninstall_pkg:
 	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/buildtree.1.gz
 
 uninstall_iso:
-	for f in ${SETS_ISO}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.d/$$f; done
+	for f in ${LIST_ISO}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.list.d/$$f; done
 	for f in ${BIN_ISO}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
 	for f in ${SHARED_ISO}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/$$f; done
 	for f in ${LIBS_ISO}; do rm -f $(DESTDIR)$(PREFIX)/lib/manjaro-tools/$$f; done
diff --git a/README.md b/README.md
index 907ea93..8284eca 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ By default it is commented and shows just initialization values done in code.
 Tools configuration is done in manjaro-tools.conf or by args.
 Specifying args will override manjaro-tools.conf settings.
 
-User sets can be placed in
+User build lists can be placed in
 
 ~~~
 $HOME/.config/manjaro-tools/{pkg,iso}.d
@@ -81,15 +81,15 @@ overriding
 
 ################ buildpkg ################
 
-# default pkg buildset; name without .set extension
-# buildset_pkg=default
+# default pkg build list; name without .list extension
+# build_list_pkg=default
 
 ################ buildiso ################
 
 # profile_repo='manjaro-tools-iso-profiles'
 
-# default iso buildset; name without .set extension
-# buildset_iso=default
+# default iso build list; name without .list extension
+# build_list_iso=default
 
 # unset defaults to given value
 # dist_name="Manjaro"
@@ -355,7 +355,7 @@ Usage: deployiso [options]
     -h                 This help
 ~~~
 
-######* upload official buildset, ie all built iso defined in a buildset
+######* upload official build list, ie all built iso defined in a build list
 
 ~~~
 deployiso -p official -c
diff --git a/bin/buildiso.in b/bin/buildiso.in
index 6e550aa..d352899 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -62,10 +62,10 @@ display_settings(){
 	show_config
 
 	msg "PROFILE:"
-	msg2 "sets_dir_iso: %s" "${sets_dir_iso}"
-	msg2 "buildsets: %s" "$(list_sets ${sets_dir_iso})"
-	msg2 "buildset_iso: %s" "${buildset_iso}"
-	msg2 "is_buildset: %s" "${is_buildset}"
+	msg2 "list_dir_iso: %s" "${list_dir_iso}"
+	msg2 "build_lists: %s" "$(show_build_lists ${list_dir_iso})"
+	msg2 "build_list_iso: %s" "${build_list_iso}"
+	msg2 "is_build_list: %s" "${is_build_list}"
 
 	msg "OPTIONS:"
 	msg2 "arch: %s" "${target_arch}"
@@ -102,7 +102,7 @@ display_settings(){
 	${verbose} && msg2 "iso_fs: %s" "${iso_fs}"
 
 	msg "BUILD QUEUE:"
-	run show_profile "${buildset_iso}"
+	run show_profile "${build_list_iso}"
 }
 
 load_user_info
@@ -124,7 +124,7 @@ sign=false
 
 usage() {
 	echo "Usage: ${0##*/} [options]"
-	echo "    -p <profile>       Buildset or profile [default: ${buildset_iso}]"
+	echo "    -p <profile>       Buildset or profile [default: ${build_list_iso}]"
 	echo "    -a <arch>          Arch [default: ${target_arch}]"
 	echo "    -b <branch>        Branch [default: ${target_branch}]"
 	echo '    -r <dir>           Chroots directory'
@@ -154,7 +154,7 @@ opts='p:a:b:r:t:k:i:czxsvqh'
 
 while getopts "${opts}" arg; do
 	case "${arg}" in
-		p) buildset_iso="$OPTARG" ;;
+		p) build_list_iso="$OPTARG" ;;
 		a) target_arch="$OPTARG" ;;
 		b) target_branch="$OPTARG" ;;
 		r) chroots_iso="$OPTARG" ;;
@@ -180,7 +180,7 @@ mirrors_conf=$(get_pac_mirrors_conf "${target_branch}")
 
 check_root "$0" "${orig_argv[@]}"
 
-eval_buildset "${sets_dir_iso}" "${buildset_iso}"
+eval_build_list "${list_dir_iso}" "${build_list_iso}"
 
 import ${LIBDIR}/util-iso.sh
 
@@ -188,4 +188,4 @@ check_requirements
 
 ${pretend} && display_settings && exit 1
 
-run build "${buildset_iso}"
+run build "${build_list_iso}"
diff --git a/bin/buildpkg.in b/bin/buildpkg.in
index 69d241d..03a90eb 100644
--- a/bin/buildpkg.in
+++ b/bin/buildpkg.in
@@ -37,12 +37,12 @@ display_settings(){
 	show_config
 
 	msg "PROFILE:"
-	msg2 "sets_dir_pkg: %s" "${sets_dir_pkg}"
-	msg2 "buildsets: %s" "$(list_sets ${sets_dir_pkg})"
-	msg2 "buildset_pkg: %s" "${buildset_pkg}"
-	msg2 "is_buildset: %s" "${is_buildset}"
+	msg2 "list_dir_pkg: %s" "${list_dir_pkg}"
+	msg2 "build _lists: %s" "$(show_build_lists ${list_dir_pkg})"
+	msg2 "build_list_pkg: %s" "${build_list_pkg}"
+	msg2 "is_build_list: %s" "${is_build_list}"
 	msg2 "make_conf_dir: %s" "${make_conf_dir}"
-	msg2 "make_profiles: %s" "$(list_make_profiles ${make_conf_dir})"
+	msg2 "make_profiles: %s" "$(show_make_profiles ${make_conf_dir})"
 
 	msg "OPTIONS:"
 	msg2 "arch: %s" "${target_arch}"
@@ -71,7 +71,7 @@ display_settings(){
 	fi
 
 	msg "BUILD QUEUE:"
-	run show_pkg "${buildset_pkg}"
+	run show_pkg "${build_list_pkg}"
 }
 
 load_user_info
@@ -88,14 +88,14 @@ clean_first=false
 wipe_clean=false
 namcap=false
 pretend=false
-is_buildset=false
+is_build_list=false
 sign=false
 udev_root=false
 is_multilib=false
 
 usage() {
 	echo "Usage: ${0##*/} [options]"
-	echo "    -p <pkg>           Buildset or pkg [default: ${buildset_pkg}]"
+	echo "    -p <pkg>           Build list or pkg [default: ${build_list_pkg}]"
 	echo "    -a <arch>          Arch [default: ${target_arch}]"
 	echo "    -b <branch>        Branch [default: ${target_branch}]"
 	echo '    -r <dir>           Chroots directory'
@@ -119,7 +119,7 @@ opts='p:a:b:r:i:cwnsuqh'
 
 while getopts "${opts}" arg; do
 	case "${arg}" in
-		p) buildset_pkg="$OPTARG" ;;
+		p) build_list_pkg="$OPTARG" ;;
 		a) target_arch="$OPTARG" ;;
 		b) target_branch="$OPTARG" ;;
 		r) chroots_pkg="$OPTARG" ;;
@@ -147,7 +147,7 @@ mkchrootpkg_args+=(-r ${work_dir})
 
 timer_start=$(get_timer)
 
-eval_buildset "${sets_dir_pkg}" "${buildset_pkg}"
+eval_build_list "${list_dir_pkg}" "${build_list_pkg}"
 
 prepare_dir "${pkg_dir}"
 
@@ -159,4 +159,4 @@ ${wipe_clean} && clean_up
 
 chroot_init
 
-run make_pkg "${buildset_pkg}"
+run make_pkg "${build_list_pkg}"
diff --git a/bin/deployiso.in b/bin/deployiso.in
index 53b6cf6..89182b6 100644
--- a/bin/deployiso.in
+++ b/bin/deployiso.in
@@ -31,10 +31,10 @@ display_settings(){
 	show_config
 
 	msg "PROFILE:"
-	msg2 "sets_dir_iso: %s" "${sets_dir_iso}"
-	msg2 "buildsets: %s" "$(list_sets ${sets_dir_iso})"
-	msg2 "buildset_iso: %s" "${buildset_iso}"
-	msg2 "is_buildset: %s" "${is_buildset}"
+	msg2 "list_dir_iso: %s" "${list_dir_iso}"
+	msg2 "build_lists: %s" "$(show_build_lists ${list_dir_iso})"
+	msg2 "build_list_iso: %s" "${build_list_iso}"
+	msg2 "is_build_list: %s" "${is_build_list}"
 
 	msg "OPTIONS:"
 	msg2 "arch: %s" "${target_arch}"
@@ -62,7 +62,7 @@ display_settings(){
 		msg2 "piece_size: %s" "${piece_size}"
 	fi
 	msg "UPLOAD QUEUE:"
-	run show_profile "${buildset_iso}"
+	run show_profile "${build_list_iso}"
 }
 
 load_user_info
@@ -83,7 +83,7 @@ mktorrent_args=(-v -p)
 
 usage() {
 	echo "Usage: ${0##*/} [options]"
-	echo "    -p                 Source folder to upload [default:${buildset_iso}]"
+	echo "    -p                 Source folder to upload [default:${build_list_iso}]"
 	echo "    -a                 Arch to upload [default:${target_arch}]"
 	echo "    -i                 The iso's init system [default:${initsys}]"
 	echo "    -l                 Limit bandwidth in kB/s [default:${limit}]"
@@ -102,7 +102,7 @@ opts='p:a:l:i:ctuvqh'
 
 while getopts "${opts}" arg; do
 	case "${arg}" in
-                p) buildset_iso="$OPTARG" ;;
+                p) build_list_iso="$OPTARG" ;;
                 a) target_arch="$OPTARG" ;;
                 i) initsys="$OPTARG" ;;
                 l) limit="$OPTARG" ;;
@@ -120,7 +120,7 @@ shift $(($OPTIND - 1))
 
 timer_start=$(get_timer)
 
-eval_buildset "${sets_dir_iso}" "${buildset_iso}"
+eval_build_list "${list_dir_iso}" "${build_list_iso}"
 
 rsync_args+=(--bwlimit=${limit})
 mktorrent_args+=(-l ${piece_size} -a ${tracker_url})
@@ -130,4 +130,4 @@ shell_url=${remote_user},${remote_project}@shell.${remote_url}
 
 ${pretend} && display_settings && exit 1
 
-run sync_dir "${buildset_iso}"
+run sync_dir "${build_list_iso}"
diff --git a/data/iso.d/community.set b/data/iso.list.d/community.list
similarity index 100%
rename from data/iso.d/community.set
rename to data/iso.list.d/community.list
diff --git a/data/iso.d/default.set b/data/iso.list.d/default.list
similarity index 100%
rename from data/iso.d/default.set
rename to data/iso.list.d/default.list
diff --git a/data/iso.d/minimal.set b/data/iso.list.d/minimal.list
similarity index 100%
rename from data/iso.d/minimal.set
rename to data/iso.list.d/minimal.list
diff --git a/data/iso.d/official.set b/data/iso.list.d/official.list
similarity index 100%
rename from data/iso.d/official.set
rename to data/iso.list.d/official.list
diff --git a/data/iso.d/sonar.set b/data/iso.list.d/sonar.list
similarity index 100%
rename from data/iso.d/sonar.set
rename to data/iso.list.d/sonar.list
diff --git a/data/manjaro-tools.conf b/data/manjaro-tools.conf
index 4cbe348..80615a9 100644
--- a/data/manjaro-tools.conf
+++ b/data/manjaro-tools.conf
@@ -32,16 +32,16 @@
 
 ################ buildpkg ################
 
-# default pkg buildset; name without .set extension
-# buildset_pkg=default
+# default pkg build list; name without .list extension
+# build_list_pkg=default
 
 ################ buildiso ################
 
 # the name of the profiles directory
 # profile_repo='manjaro-tools-iso-profiles'
 
-# default iso buildset; name without .set extension
-# buildset_iso=default
+# default iso build list; name without .list extension
+# build_list_iso=default
 
 # the dist name; default: Manjaro
 # dist_name="Manjaro"
diff --git a/data/pkg.d/default.set b/data/pkg.list.d/default.list
similarity index 100%
rename from data/pkg.d/default.set
rename to data/pkg.list.d/default.list
diff --git a/docbook/buildiso.xml b/docbook/buildiso.xml
index 29c9e64..76494c3 100644
--- a/docbook/buildiso.xml
+++ b/docbook/buildiso.xml
@@ -74,8 +74,8 @@
 			<varlistentry>
 				<term><option>-p PROFILE...</option></term>
 
-				<listitem><para>Name of the buildset or name of the directory
-				you will build. It needs to cantains a existing buildset or a
+				<listitem><para>Name of the build list or name of the directory
+				you will build. It needs to cantains a existing build list or a
 				folder with a valid profile.</para></listitem>
 			</varlistentry>
 
diff --git a/docbook/buildpkg.xml b/docbook/buildpkg.xml
index d64aef3..a5a5847 100644
--- a/docbook/buildpkg.xml
+++ b/docbook/buildpkg.xml
@@ -70,8 +70,8 @@
 			<varlistentry>
 				<term><option>-p PROFILE...</option></term>
 
-				<listitem><para>Name of the buildset or name of the directory
-				you will build. It needs to cantain a existing buildset or a
+				<listitem><para>Name of the build list or name of the directory
+				you will build. It needs to cantain a existing build list or a
 				folder with a valid PKGBUILD.</para></listitem>
 			</varlistentry>
 
diff --git a/docbook/deployiso.xml b/docbook/deployiso.xml
index 6962769..78e0101 100644
--- a/docbook/deployiso.xml
+++ b/docbook/deployiso.xml
@@ -73,7 +73,7 @@
 			<varlistentry>
 				<term><option>-p PROFILE...</option></term>
 
-				<listitem><para>Name of the buildset or name of the directory
+				<listitem><para>Name of the build list or name of the directory
 				you will upload.</para></listitem>
 			</varlistentry>
 
diff --git a/docbook/manjaro-tools.conf.xml b/docbook/manjaro-tools.conf.xml
index 3654977..431b5ec 100644
--- a/docbook/manjaro-tools.conf.xml
+++ b/docbook/manjaro-tools.conf.xml
@@ -160,9 +160,9 @@
 
 		<variablelist>
 			<varlistentry>
-				<term><varname>buildset_pkg=</varname></term>
+				<term><varname>build_list_pkg=</varname></term>
 
-				<listitem><para>Default set for buildpkg without the .set
+				<listitem><para>Default list for buildpkg without the .list
 				extension.
 				</para></listitem>
 			</varlistentry>
@@ -177,9 +177,9 @@
 
 		<variablelist>
 		<varlistentry>
-			<term><varname>buildset_iso=</varname></term>
+			<term><varname>build_list_iso=</varname></term>
 
-			<listitem><para>Default set for buildiso without the .set
+			<listitem><para>Default list for buildiso without the .list
 			extension.
 			</para></listitem>
 		</varlistentry>
diff --git a/lib/util-pkg.sh b/lib/util-pkg.sh
index 1470bde..e111a23 100644
--- a/lib/util-pkg.sh
+++ b/lib/util-pkg.sh
@@ -155,7 +155,7 @@ check_build(){
 
 find_pkg(){
 	local result=$(find . -type d -name "$1")
-	[[ -z $result ]] && die "%s is not a valid package or buildset!" "$1"
+	[[ -z $result ]] && die "%s is not a valid package or build list!" "$1"
 }
 
 load_group(){
diff --git a/lib/util.sh b/lib/util.sh
index 00bbe16..c6875f4 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -72,28 +72,28 @@ get_pac_mirrors_conf(){
 	echo "$conf"
 }
 
-read_set(){
+read_build_list(){
 	local _space="s| ||g" \
 		_clean=':a;N;$!ba;s/\n/ /g' \
 		_com_rm="s|#.*||g"
 
-	stack=$(sed "$_com_rm" "$1.set" \
+	build_list=$(sed "$_com_rm" "$1.list" \
 		| sed "$_space" \
 		| sed "$_clean")
 }
 
-# $1: sets_dir
-list_sets(){
+# $1: list_dir
+show_build_lists(){
 	local prof temp
-	for item in $(ls $1/*.set); do
+	for item in $(ls $1/*.list); do
 		temp=${item##*/}
-		prof=${prof:-}${prof:+|}${temp%.set}
+		prof=${prof:-}${prof:+|}${temp%.list}
 	done
 	echo $prof
 }
 
 # $1: make_conf_dir
-list_make_profiles(){
+show_make_profiles(){
 	local arch temp
 	for item in $(ls $1/*.conf); do
 		temp=${item##*/}
@@ -102,18 +102,18 @@ list_make_profiles(){
 	echo $arch
 }
 
-# $1: sets_dir
-# $2: buildset
-eval_buildset(){
+# $1: list_dir
+# $2: build list
+eval_build_list(){
 	eval "case $2 in
-		$(list_sets $1)) is_buildset=true; read_set $1/$2 ;;
-		*) is_buildset=false ;;
+		$(show_build_lists $1)) is_build_list=true; read_build_list $1/$2 ;;
+		*) is_build_list=false ;;
 	esac"
 }
 
 get_edition(){
 	local result=$(find ${run_dir} -maxdepth 2 -name "$1") path
-	[[ -z $result ]] && die "%s is not a valid profile or buildset!" "$1"
+	[[ -z $result ]] && die "%s is not a valid profile or build list!" "$1"
 	path=${result%/*}
 	echo ${path##*/}
 }
@@ -249,13 +249,13 @@ init_buildtree(){
 init_buildpkg(){
 	chroots_pkg="${chroots_dir}/buildpkg"
 
-	sets_dir_pkg="${SYSCONFDIR}/pkg.d"
+	list_dir_pkg="${SYSCONFDIR}/pkg.list.d"
 
 	make_conf_dir="${SYSCONFDIR}/make.conf.d"
 
-	[[ -d ${USERCONFDIR}/pkg.d ]] && sets_dir_pkg=${USERCONFDIR}/pkg.d
+	[[ -d ${USERCONFDIR}/pkg.list.d ]] && list_dir_pkg=${USERCONFDIR}/pkg.list.d
 
-	[[ -z ${buildset_pkg} ]] && buildset_pkg='default'
+	[[ -z ${build_list_pkg} ]] && build_list_pkg='default'
 
 	cache_dir_pkg=${cache_dir}/pkg
 }
@@ -277,11 +277,11 @@ get_codename(){
 init_buildiso(){
 	chroots_iso="${chroots_dir}/buildiso"
 
-	sets_dir_iso="${SYSCONFDIR}/iso.d"
+	list_dir_iso="${SYSCONFDIR}/iso.list.d"
 
-	[[ -d ${USERCONFDIR}/iso.d ]] && sets_dir_iso=${USERCONFDIR}/iso.d
+	[[ -d ${USERCONFDIR}/iso.list.d ]] && list_dir_iso=${USERCONFDIR}/iso.list.d
 
-	[[ -z ${buildset_iso} ]] && buildset_iso='default'
+	[[ -z ${build_list_iso} ]] && build_list_iso='default'
 
 	cache_dir_iso="${cache_dir}/iso"
 
@@ -558,7 +558,7 @@ is_valid_init(){
 
 is_valid_arch_pkg(){
 	eval "case $1 in
-		$(list_make_profiles "${make_conf_dir}")) return 0 ;;
+		$(show_make_profiles "${make_conf_dir}")) return 0 ;;
 		*) return 1 ;;
 	esac"
 }
@@ -578,8 +578,8 @@ is_valid_branch(){
 }
 
 run(){
-	if ${is_buildset};then
-		for item in ${stack[@]};do
+	if ${is_build_list};then
+		for item in ${build_list[@]};do
 			$1 $item
 		done
 	else