diff --git a/newapkbuild.in b/newapkbuild.in
index 64b726b..1f14498 100644
--- a/newapkbuild.in
+++ b/newapkbuild.in
@@ -197,15 +197,15 @@ source="$source"
 __EOF__
 
 	abuild -f fetch unpack
-	# Figure out the _builddir
+	# Figure out the builddir
 	for i in src/*; do
 		if [ -d "$i" ]; then
 			sdir=$i
-			_builddir=$(echo ${i#*/} | sed "s/$pv/\$pkgver/g")
-			_builddir="\"\$srcdir\"/$_builddir"
+			builddir=$(echo ${i#*/} | sed "s/$pv/\$pkgver/g")
+			builddir="\"\$srcdir\"/$_builddir"
 		fi
 	done
-	echo "_builddir=$_builddir" >> APKBUILD
+	echo "builddir=$builddir" >> APKBUILD
 
 	# Check if its autotools
 	if [ -z "$buildtype" ]; then
@@ -227,7 +227,7 @@ __EOF__
 	# Create build() function
 	cat >>APKBUILD<<__EOF__
 build() {
-	cd "\$_builddir"
+	cd "\$builddir"
 __EOF__
 
 	case "$buildtype" in
@@ -251,7 +251,7 @@ __EOF__
 	# Create package() function
 	cat >>APKBUILD<<__EOF__
 package() {
-	cd "\$_builddir"
+	cd "\$builddir"
 __EOF__
 
 	case "$buildtype" in