diff --git a/haiku-apps/alivejournal/alivejournal-1.61.recipe b/haiku-apps/alivejournal/alivejournal-1.61.recipe
index d2d90f192..5d1793542 100644
--- a/haiku-apps/alivejournal/alivejournal-1.61.recipe
+++ b/haiku-apps/alivejournal/alivejournal-1.61.recipe
@@ -5,11 +5,11 @@ COPYRIGHT="2000 Simon Huet
 	2010 Sean Graham"
 LICENSE="GNU GPL v2"
 REVISION="1"
-gitSrcRevision="c25a118cde4d97f2d0d514732b548e592cac9c29"
-SOURCE_URI="https://github.com/grahams/alivejournal/archive/$gitSrcRevision.tar.gz"
+srcGitRev="c25a118cde4d97f2d0d514732b548e592cac9c29"
+SOURCE_URI="https://github.com/grahams/alivejournal/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="675345bbadccda762fd87c1f8d133955af41b5e36584b2d9d497246f361e563c"
-SOURCE_FILENAME="alivejournal-$portVersion-$gitSrcRevision.tar.gz"
-SOURCE_DIR="alivejournal-$gitSrcRevision"
+SOURCE_FILENAME="alivejournal-$portVersion-$srcGitRev.tar.gz"
+SOURCE_DIR="alivejournal-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2 x86_64"
 
diff --git a/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe b/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe
index 60d339c3f..ba4182e9a 100644
--- a/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe
+++ b/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe
@@ -6,10 +6,10 @@ HOMEPAGE="https://github.com/HaikuArchives/BookmarkConverter"
 COPYRIGHT="2015 Markus Himmel"
 LICENSE="MIT"
 REVISION="5"
-gitRevision="47d5d182f1ff1cdab5d0b16f088ab264378d58fd"
-SOURCE_URI="https://github.com/HaikuArchives/BookmarkConverter/archive/$gitRevision.zip"
-SOURCE_DIR="BookmarkConverter-$gitRevision"
+srcGitRev="47d5d182f1ff1cdab5d0b16f088ab264378d58fd"
+SOURCE_URI="https://github.com/HaikuArchives/BookmarkConverter/archive/$srcGitRev.zip"
 CHECKSUM_SHA256="414317453cf3223f55f17ac643e871edac61d58f84d54b6d6183df309f24ab18"
+SOURCE_DIR="BookmarkConverter-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 
diff --git a/haiku-apps/catkeyseditor/catkeyseditor-0.1.0.recipe b/haiku-apps/catkeyseditor/catkeyseditor-0.1.0.recipe
index 80e3ee393..75fb4ec17 100644
--- a/haiku-apps/catkeyseditor/catkeyseditor-0.1.0.recipe
+++ b/haiku-apps/catkeyseditor/catkeyseditor-0.1.0.recipe
@@ -10,10 +10,10 @@ HOMEPAGE="https://github.com/puckipedia/BeLocalized"
 COPYRIGHT="2014-2015 Puck Meerburg"
 LICENSE="MIT"
 REVISION="1"
-scrGitRev="3fa4f550ee83a4b64c27571eb518270f9500791b"
-SOURCE_URI="$HOMEPAGE/archive/$scrGitRev.tar.gz"
+srcGitRev="3fa4f550ee83a4b64c27571eb518270f9500791b"
+SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="054c0394572aa7e4c485e7f018544bc2431eaf12d6d64e0a578d5061d1cf00eb"
-SOURCE_DIR="BeLocalized-$scrGitRev"
+SOURCE_DIR="BeLocalized-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
diff --git a/haiku-apps/catkeyseditor/catkeyseditor-0.1.1.recipe b/haiku-apps/catkeyseditor/catkeyseditor-0.1.1.recipe
index f579fa724..d399a5adf 100644
--- a/haiku-apps/catkeyseditor/catkeyseditor-0.1.1.recipe
+++ b/haiku-apps/catkeyseditor/catkeyseditor-0.1.1.recipe
@@ -10,10 +10,10 @@ HOMEPAGE="https://github.com/puckipedia/BeLocalized"
 COPYRIGHT="2014-2015 Puck Meerburg"
 LICENSE="MIT"
 REVISION="2"
-scrGitRev="989904ff0181147e5fe7e205096f09e1cc4d8bdd"
-SOURCE_URI="$HOMEPAGE/archive/$scrGitRev.tar.gz"
+srcGitRev="989904ff0181147e5fe7e205096f09e1cc4d8bdd"
+SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="894eab6f25b6f67afadea018b4ab9508af927cc7ddd349b4a924bc3ba832b6f6"
-SOURCE_DIR="BeLocalized-$scrGitRev"
+SOURCE_DIR="BeLocalized-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/haiku-apps/catkeyseditor/catkeyseditor-0.1.2.recipe b/haiku-apps/catkeyseditor/catkeyseditor-0.1.2.recipe
index affbefdd3..2785a0e68 100644
--- a/haiku-apps/catkeyseditor/catkeyseditor-0.1.2.recipe
+++ b/haiku-apps/catkeyseditor/catkeyseditor-0.1.2.recipe
@@ -10,10 +10,10 @@ HOMEPAGE="https://github.com/puckipedia/BeLocalized"
 COPYRIGHT="2014-2017 Puck Meerburg"
 LICENSE="MIT"
 REVISION="3"
-scrGitRev="001b112abf2f6a963c9f9bbb84c7cb6fe7d579f7"
-SOURCE_URI="$HOMEPAGE/archive/$scrGitRev.tar.gz"
+srcGitRev="001b112abf2f6a963c9f9bbb84c7cb6fe7d579f7"
+SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="dc80286e6737cffb31df1bf0752896cdc561f1c0bfb5f5015cd0fd218d6ee9ca"
-SOURCE_DIR="BeLocalized-$scrGitRev"
+SOURCE_DIR="BeLocalized-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 
diff --git a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
index 35bbebd33..f855eb6b5 100644
--- a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
+++ b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
@@ -6,10 +6,11 @@ HOMEPAGE="https://github.com/AdrianArroyoCalle/cmake-haiku"
 COPYRIGHT="2012-2013 Adrián Arroyo Calle"
 LICENSE="BSD (3-clause)"
 REVISION="2"
-archive=a42d55b93d8d7c1e3b19a31f4ee85f63441c4975
-SOURCE_URI="https://github.com/AdrianArroyoCalle/cmake-haiku/archive/$archive.tar.gz"
+srcGitRev="a42d55b93d8d7c1e3b19a31f4ee85f63441c4975"
+SOURCE_URI="https://github.com/AdrianArroyoCalle/cmake-haiku/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="79839f164f0d1655369d5252cf31bdff14282312352c13db037bbdd6d8e68ee6"
-SOURCE_DIR="cmake-haiku-$archive"
+SOURCE_DIR="cmake-haiku-$srcGitRev"
+
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 
diff --git a/haiku-apps/converttolf/converttolf-0.0.0.recipe b/haiku-apps/converttolf/converttolf-0.0.0.recipe
index b5f0031ec..63007ec34 100644
--- a/haiku-apps/converttolf/converttolf-0.0.0.recipe
+++ b/haiku-apps/converttolf/converttolf-0.0.0.recipe
@@ -4,17 +4,14 @@ ConvertToLF is a filter that removes the carriage returns used in the end of \
 file markers on some operating systems. Haiku uses just a line feed to mark \
 the end of line, and gcc, the Haiku compiler and StyledEdit don't function \
 properly with carriage returns in source code / text files.
-" # Taken from the homepage
+"
 HOMEPAGE="https://github.com/HaikuArchives/ConvertToLF/"
-SOURCE_URI="git://github.com/HaikuArchives/ConvertToLF.git#d8ec50f92a65d9fd1058adf98fe2515fbafa243c"
-
-REVISION="1"
-
 COPYRIGHT="
 	2001 fReT
 	"
-
 LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="git://github.com/HaikuArchives/ConvertToLF.git#d8ec50f92a65d9fd1058adf98fe2515fbafa243c"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
@@ -22,19 +19,18 @@ PROVIDES="
 	converttolf = $portVersion
 	app:ConvertToLF = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	"
 
-BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:xres
-	"
-
 BUILD_REQUIRES="
 	haiku_devel
 	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:xres
+	"
+
 BUILD()
 {
 	g++ -lbe -ltracker -o ConvertToLF Source/Strip.cpp
diff --git a/haiku-apps/maps/maps-1.0.recipe b/haiku-apps/maps/maps-1.0.recipe
index e74c91330..e6751f941 100644
--- a/haiku-apps/maps/maps-1.0.recipe
+++ b/haiku-apps/maps/maps-1.0.recipe
@@ -7,10 +7,11 @@ HOMEPAGE="https://github.com/raefaldhia/Maps"
 COPYRIGHT="2016-2017 Raefaldhi Amartya Junior"
 LICENSE="MIT"
 REVISION="1"
-gitSrcRevision="fae2e64aca6ad00e2827556f8ddaf24adec891b8"
-SOURCE_URI="https://github.com/raefaldhia/Maps/archive/$gitSrcRevision.tar.gz"
+srcGitRev="fae2e64aca6ad00e2827556f8ddaf24adec891b8"
+SOURCE_URI="https://github.com/raefaldhia/Maps/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="bec05e952fec0af76d21ad1a1ab04905ab5d8f04037c6fbd20a49dfa1e811684"
-SOURCE_DIR="Maps-$gitSrcRevision"
+SOURCE_DIR="Maps-$srcGitRev"
+
 ARCHITECTURES="x86_gcc2 x86_64"
 
 PROVIDES="
diff --git a/haiku-apps/paladin/paladin-1.4~git.recipe b/haiku-apps/paladin/paladin-1.4~git.recipe
index cd9bbb039..a0525b13e 100644
--- a/haiku-apps/paladin/paladin-1.4~git.recipe
+++ b/haiku-apps/paladin/paladin-1.4~git.recipe
@@ -23,14 +23,16 @@ COPYRIGHT="2001-2010 DarkWyrm
        2014 John Scipione"
 LICENSE="MIT"
 REVISION="4"
-commit="c480d7107bfd01dae302fd6e13098aeccec22548"
-SOURCE_URI="https://github.com/HaikuArchives/Paladin/archive/$commit.tar.gz"
+srcGitRev="c480d7107bfd01dae302fd6e13098aeccec22548"
+SOURCE_URI="https://github.com/HaikuArchives/Paladin/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="3f071bae6960581fdd744a171402d359b8d89b8f83c5d39980f4cea31f2c2d3f"
-SOURCE_DIR="Paladin-$commit"
+SOURCE_DIR="Paladin-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+USER_SETTINGS_FILES="settings/Paladin_settings"
+
 PROVIDES="
 	paladin$secondaryArchSuffix = $portVersion
 	app:Paladin$secondaryArchSuffix
@@ -58,8 +60,6 @@ BUILD_PREREQUIRES="
 	makefile_engine
 	"
 
-USER_SETTINGS_FILES="settings/Paladin_settings"
-
 BUILD()
 {
 	./buildsuite.sh $jobs
diff --git a/haiku-apps/pe/pe-2.4.4_2014_03_18.recipe b/haiku-apps/pe/pe-2.4.4_2014_03_18.recipe
index 1e9fbce82..4d17b6432 100644
--- a/haiku-apps/pe/pe-2.4.4_2014_03_18.recipe
+++ b/haiku-apps/pe/pe-2.4.4_2014_03_18.recipe
@@ -5,32 +5,32 @@ and a structural view for several programming language, as well as basic \
 support for Makefile and Jamfile project management.
 "
 HOMEPAGE="https://github.com/olta/pe"
-LICENSE="
-	BSD (4-clause)
-	MIT
-	"
-
 COPYRIGHT="
 	1996-2002 Maarteen Hekkelman
 	2003-2014 Team Pe
 	"
-
-srcrev="0c0b4928d863b58433e41fe76f59dc6170dff7c0"
-SOURCE_DIR="pe-$srcrev"
-SOURCE_URI="https://github.com/olta/pe/archive/$srcrev.tar.gz"
-CHECKSUM_SHA256="f43f0b919d514a16cfc51fa289d658af55b32a653ba1735ab21bec15b37e10b3"
-SOURCE_FILENAME="pe-$srcrev.tar.gz"
-
-
+LICENSE="
+	BSD (4-clause)
+	MIT
+	"
 REVISION="1"
+srcGitRev="0c0b4928d863b58433e41fe76f59dc6170dff7c0"
+SOURCE_URI="https://github.com/olta/pe/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="f43f0b919d514a16cfc51fa289d658af55b32a653ba1735ab21bec15b37e10b3"
+SOURCE_FILENAME="pe-$srcGitRev.tar.gz"
+SOURCE_DIR="pe-$srcGitRev"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
+USER_SETTINGS_FILES="
+	settings/pe directory
+	"
+
 PROVIDES="
 	pe = $portVersion
 	app:Pe = $portVersion compat >= 2
 	cmd:lpe = $portVersion compat >= 2
 	"
-
 REQUIRES="
 	haiku
 	lib:libpcre
@@ -42,7 +42,6 @@ BUILD_REQUIRES="
 	devel:libpcre
 	devel:libpcreposix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:bison
 	cmd:flex
@@ -51,10 +50,6 @@ BUILD_PREREQUIRES="
 	cmd:ld
 	"
 
-USER_SETTINGS_FILES="
-	settings/pe directory
-	"
-
 BUILD()
 {
 	jam -q
diff --git a/haiku-apps/pe/pe-2.4.4_2014_05_29.recipe b/haiku-apps/pe/pe-2.4.4_2014_05_29.recipe
index b8a0ee9a1..c0dbfdfea 100644
--- a/haiku-apps/pe/pe-2.4.4_2014_05_29.recipe
+++ b/haiku-apps/pe/pe-2.4.4_2014_05_29.recipe
@@ -5,32 +5,32 @@ and a structural view for several programming language, as well as basic \
 support for Makefile and Jamfile project management.
 "
 HOMEPAGE="https://github.com/olta/pe"
-LICENSE="
-	BSD (4-clause)
-	MIT
-	"
-
 COPYRIGHT="
 	1996-2002 Maarteen Hekkelman
 	2003-2014 Team Pe
 	"
-
-srcrev="8c23b804617361c0ce25dc42fce1c6dea46bbde5"
-SOURCE_DIR="pe-$srcrev"
-SOURCE_URI="https://github.com/olta/pe/archive/$srcrev.tar.gz"
-CHECKSUM_SHA256="b3cb6b102a4b509aa6882d7c5a1dd55b3bc6fb072a9a784f98be03809967c247"
-SOURCE_FILENAME="pe-$srcrev.tar.gz"
-
-
+LICENSE="
+	BSD (4-clause)
+	MIT
+	"
 REVISION="1"
+srcGitRev="8c23b804617361c0ce25dc42fce1c6dea46bbde5"
+SOURCE_URI="https://github.com/olta/pe/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="b3cb6b102a4b509aa6882d7c5a1dd55b3bc6fb072a9a784f98be03809967c247"
+SOURCE_FILENAME="pe-$srcGitRev.tar.gz"
+SOURCE_DIR="pe-$srcGitRev"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
+USER_SETTINGS_FILES="
+	settings/pe directory
+	"
+
 PROVIDES="
 	pe = $portVersion
 	app:Pe = $portVersion compat >= 2
 	cmd:lpe = $portVersion compat >= 2
 	"
-
 REQUIRES="
 	haiku
 	lib:libpcre
@@ -42,7 +42,6 @@ BUILD_REQUIRES="
 	devel:libpcre
 	devel:libpcreposix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:bison
 	cmd:flex
@@ -51,10 +50,6 @@ BUILD_PREREQUIRES="
 	cmd:ld
 	"
 
-USER_SETTINGS_FILES="
-	settings/pe directory
-	"
-
 BUILD()
 {
 	jam -q
diff --git a/haiku-apps/pe/pe-2.4.5.recipe b/haiku-apps/pe/pe-2.4.5.recipe
index 2bb2fe61d..791e3c5ff 100644
--- a/haiku-apps/pe/pe-2.4.5.recipe
+++ b/haiku-apps/pe/pe-2.4.5.recipe
@@ -12,11 +12,11 @@ LICENSE="
 	MIT
 	"
 REVISION="8"
-gitCommit="f50baf0da36478cdb75d3799d8c3d4f5dbe49bce"
-SOURCE_URI="https://github.com/HaikuArchives/Pe/archive/$gitCommit.tar.gz"
+srcGitRev="f50baf0da36478cdb75d3799d8c3d4f5dbe49bce"
+SOURCE_URI="https://github.com/HaikuArchives/Pe/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="94e3946437bc5f5e0163ed3f44b3f597c4471106999d00262ccd9fff763df091"
-SOURCE_FILENAME="pe-$gitCommit.tar.gz"
-SOURCE_DIR="Pe-$gitCommit"
+SOURCE_FILENAME="pe-$srcGitRev.tar.gz"
+SOURCE_DIR="Pe-$srcGitRev"
 PATCHSET="pe-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
diff --git a/haiku-apps/pecorename/pecorename-1.5.recipe b/haiku-apps/pecorename/pecorename-1.5.recipe
index b384e503c..30366725b 100644
--- a/haiku-apps/pecorename/pecorename-1.5.recipe
+++ b/haiku-apps/pecorename/pecorename-1.5.recipe
@@ -22,10 +22,10 @@ HOMEPAGE="http://www.maybe.de/software/pecorename"
 COPYRIGHT="2008 Werner Freytag"
 LICENSE="MIT"
 REVISION="5"
-commit="9b3ceb76a73881ad821b2b9535e4ad258b486c45"
-SOURCE_URI="https://github.com/HaikuArchives/PecoRename/archive/$commit.tar.gz"
+srcGitRev="9b3ceb76a73881ad821b2b9535e4ad258b486c45"
+SOURCE_URI="https://github.com/HaikuArchives/PecoRename/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="52228295d058a7348a3ff9385bcf0f3dc058da10853538aa27eca0c1619b9f20"
-SOURCE_DIR="PecoRename-$commit"
+SOURCE_DIR="PecoRename-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2 !x86 !x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 !x86"
diff --git a/haiku-apps/q/q-1.1.recipe b/haiku-apps/q/q-1.1.recipe
index e86c9e8fe..6cde1e431 100644
--- a/haiku-apps/q/q-1.1.recipe
+++ b/haiku-apps/q/q-1.1.recipe
@@ -6,10 +6,11 @@ HOMEPAGE="https://github.com/HaikuArchives/Q"
 COPYRIGHT="2001 Masaaki Tani, Dr. Hartmut Reh"
 LICENSE="Unknown"
 REVISION="2"
-sourceHash="b17751e7256ee51531802dfd1882598f5127b463"
-SOURCE_URI="https://github.com/HaikuArchives/q/archive/$sourceHash.tar.gz"
+srcGitRev="b17751e7256ee51531802dfd1882598f5127b463"
+SOURCE_URI="https://github.com/HaikuArchives/q/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="2e311b3e036cfe2913454a9a9b6fdbb1bf1d28761edb11e7907bdb436c964501"
-SOURCE_DIR="Q-$sourceHash"
+SOURCE_DIR="Q-$srcGitRev"
+
 ARCHITECTURES="x86_gcc2 !x86 !x86_64"
 
 PROVIDES="
diff --git a/haiku-apps/resourcer/resourcer-1.0.recipe b/haiku-apps/resourcer/resourcer-1.0.recipe
index 690c7f356..25763c212 100644
--- a/haiku-apps/resourcer/resourcer-1.0.recipe
+++ b/haiku-apps/resourcer/resourcer-1.0.recipe
@@ -7,10 +7,10 @@ HOMEPAGE="https://github.com/HaikuArchives/Resourcer"
 COPYRIGHT="2000 Nathan Whitehorn"
 LICENSE="BSD (3-clause)"
 REVISION="6"
-gitCommit="de931de8f560698c463347dea76f831a9ef2741a"
-SOURCE_URI="https://github.com/HaikuArchives/Resourcer/archive/$gitCommit.tar.gz"
+srcGitRev="de931de8f560698c463347dea76f831a9ef2741a"
+SOURCE_URI="https://github.com/HaikuArchives/Resourcer/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="0a00db1f7f8fa1e7cbc9668625c1f8a46e75f5a2fa8367c38d9a4f780de9c273"
-SOURCE_DIR="Resourcer-$gitCommit"
+SOURCE_DIR="Resourcer-$srcGitRev"
 
 ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
 
diff --git a/haiku-apps/seeker/seeker-1.0.recipe b/haiku-apps/seeker/seeker-1.0.recipe
index 323d6bff9..ecef93ef0 100644
--- a/haiku-apps/seeker/seeker-1.0.recipe
+++ b/haiku-apps/seeker/seeker-1.0.recipe
@@ -6,10 +6,10 @@ HOMEPAGE="https://github.com/HaikuArchives/Seeker"
 COPYRIGHT="DarkWyrm"
 LICENSE="MIT"
 REVISION="7"
-gitCommit="d88e5821185eab416590374f2de290a3c6fdc09f"
-SOURCE_URI="https://github.com/HaikuArchives/Seeker/archive/$gitCommit.tar.gz"
+srcGitRev="d88e5821185eab416590374f2de290a3c6fdc09f"
+SOURCE_URI="https://github.com/HaikuArchives/Seeker/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="9d200cf9e48eecdd838ec6a2c83fc4d45ef362b73cbddfcb6afcac1ae42c27e1"
-SOURCE_DIR="Seeker-$gitCommit"
+SOURCE_DIR="Seeker-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 
diff --git a/haiku-apps/sequitur/sequitur-2.1.2.recipe b/haiku-apps/sequitur/sequitur-2.1.2.recipe
index b8a33fcc3..0af1c46b2 100644
--- a/haiku-apps/sequitur/sequitur-2.1.2.recipe
+++ b/haiku-apps/sequitur/sequitur-2.1.2.recipe
@@ -25,10 +25,10 @@ HOMEPAGE="https://github.com/HaikuArchives/Sequitur"
 COPYRIGHT="2001 Eric Hackborn"
 LICENSE="Public Domain"
 REVISION="5"
-commit="c5907949806d70f4888f4c47cffcd3eefce48c4c"
-SOURCE_URI="https://github.com/HaikuArchives/Sequitur/archive/$commit.tar.gz"
+srcGitRev="c5907949806d70f4888f4c47cffcd3eefce48c4c"
+SOURCE_URI="https://github.com/HaikuArchives/Sequitur/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="6ecc04b880b1cab96243aa083d3f0a651afba4ae50db676ca5248790b71e7291"
-SOURCE_DIR="Sequitur-$commit"
+SOURCE_DIR="Sequitur-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2"
 
diff --git a/haiku-apps/stylededitplus/stylededitplus-1.0.recipe b/haiku-apps/stylededitplus/stylededitplus-1.0.recipe
index 8156264ab..7117d4358 100644
--- a/haiku-apps/stylededitplus/stylededitplus-1.0.recipe
+++ b/haiku-apps/stylededitplus/stylededitplus-1.0.recipe
@@ -11,8 +11,8 @@ SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="72115beb196882234e414fcab05c7040870b643d978dfc57aecd26f86dd7cd47"
 SOURCE_FILENAME="StyledEditPlus-$portVersion-$srcGitRev.tar.gz"
 SOURCE_DIR="StyledEditPlus-$srcGitRev"
-srcGitRev2="52384217f32eb93f0a6b2d04453bb68f561e39c0"
-SOURCE_URI_2="https://github.com/Paradoxianer/FontPanel/archive/$srcGitRev2.tar.gz"
+srcGitRev_2="52384217f32eb93f0a6b2d04453bb68f561e39c0"
+SOURCE_URI_2="https://github.com/Paradoxianer/FontPanel/archive/$srcGitRev_2.tar.gz"
 CHECKSUM_SHA256_2="51732271c81e70dbc65fa6c2dbcf9af2b117b36affe5f17f04b71286939c01b0"
 
 ARCHITECTURES="x86_gcc2 ?x86_64"
@@ -36,7 +36,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	cp -rd $sourceDir2/FontPanel-$srcGitRev2/* \
+	cp -rd $sourceDir2/FontPanel-$srcGitRev_2/* \
 		src/ui/Panels/FontPanel/
 	make OBJ_DIR=objects -C src
 }
diff --git a/haiku-apps/taskmanager/taskmanager-0.1.7.recipe b/haiku-apps/taskmanager/taskmanager-0.1.7.recipe
index 69521aad5..c617a1361 100644
--- a/haiku-apps/taskmanager/taskmanager-0.1.7.recipe
+++ b/haiku-apps/taskmanager/taskmanager-0.1.7.recipe
@@ -13,10 +13,10 @@ HOMEPAGE="https://github.com/HaikuArchives/TaskManager"
 COPYRIGHT="2000 Thomas Krammer"
 LICENSE="Apache v2"
 REVISION="3"
-commit="7b3f1afe03230a9548cc0670c9bf95d146b49a48"
-SOURCE_URI="https://github.com/HaikuArchives/TaskManager/archive/$commit.tar.gz"
-SOURCE_DIR="TaskManager-$commit"
+srcGitRev="7b3f1afe03230a9548cc0670c9bf95d146b49a48"
+SOURCE_URI="https://github.com/HaikuArchives/TaskManager/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="6bca16de38291406579676a61aee65a5c13089a9606710b2a77c7720b3253556"
+SOURCE_DIR="TaskManager-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
diff --git a/haiku-apps/thememanager/thememanager-1.0~git.recipe b/haiku-apps/thememanager/thememanager-1.0~git.recipe
index 2d50ce69e..f0c08ecdd 100644
--- a/haiku-apps/thememanager/thememanager-1.0~git.recipe
+++ b/haiku-apps/thememanager/thememanager-1.0~git.recipe
@@ -7,10 +7,10 @@ HOMEPAGE="https://github.com/mmuman/HaikuThemeManager/"
 LICENSE="MIT"
 COPYRIGHT="2000-2015 François Revol"
 REVISION="3"
-commit="38a90a92ea0150a4589865e8ce2054e9726f6352"
-SOURCE_URI="$HOMEPAGE/archive/$commit.tar.gz"
+srcGitRev="38a90a92ea0150a4589865e8ce2054e9726f6352"
+SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="897c4c34f2c4d2988c3b2f20bcdfbaca3df04071a8ccd79578ab67890b05caeb"
-SOURCE_DIR="HaikuThemeManager-$commit"
+SOURCE_DIR="HaikuThemeManager-$srcGitRev"
 PATCHES="thememanager-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 ?x86 x86_64"
diff --git a/haiku-apps/trackergrep/trackergrep-5.2.recipe b/haiku-apps/trackergrep/trackergrep-5.2.recipe
index cddff6e98..16f8d4aaa 100644
--- a/haiku-apps/trackergrep/trackergrep-5.2.recipe
+++ b/haiku-apps/trackergrep/trackergrep-5.2.recipe
@@ -9,10 +9,10 @@ COPYRIGHT="1998-2006 Matthijs Hollemans
 	2007 Jonas Sundström."
 LICENSE="MIT"
 REVISION="4"
-gitCommit="4b7b780c39eab07b316f6bb511b15919513b9324"
-SOURCE_URI="https://github.com/HaikuArchives/TrackerGrep/archive/$gitCommit.tar.gz"
+srcGitRev="4b7b780c39eab07b316f6bb511b15919513b9324"
+SOURCE_URI="https://github.com/HaikuArchives/TrackerGrep/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="f17598bf340c6e0f5073f6ce5b21a2bea157ee5c72b65d94f3bf1530366e2cae"
-SOURCE_DIR="TrackerGrep-$gitCommit"
+SOURCE_DIR="TrackerGrep-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/haiku-apps/ultradv/ultradv-0.0.1.recipe b/haiku-apps/ultradv/ultradv-0.0.1.recipe
index eca6b6e94..bd441dd33 100644
--- a/haiku-apps/ultradv/ultradv-0.0.1.recipe
+++ b/haiku-apps/ultradv/ultradv-0.0.1.recipe
@@ -8,10 +8,10 @@ HOMEPAGE="https://github.com/Barrett17/UltraDV"
 COPYRIGHT="1998-2017 UltraDV Project"
 LICENSE="MIT"
 REVISION="5"
-gitCommit="2a27d23d6924fdcd12d2d73fe50b9d3edb573b75"
-SOURCE_URI="https://github.com/Barrett17/UltraDV/archive/$gitCommit.tar.gz"
+srcGitRev="2a27d23d6924fdcd12d2d73fe50b9d3edb573b75"
+SOURCE_URI="https://github.com/Barrett17/UltraDV/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="a8db17369ca1aebeb2897c838c0c939295a6a0c59525a5c54904cd61b54c8160"
-SOURCE_DIR="UltraDV-$gitCommit"
+SOURCE_DIR="UltraDV-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/haiku-apps/wakeup/wakeup-1.0.recipe b/haiku-apps/wakeup/wakeup-1.0.recipe
index ac52473c9..b6a8cebb6 100644
--- a/haiku-apps/wakeup/wakeup-1.0.recipe
+++ b/haiku-apps/wakeup/wakeup-1.0.recipe
@@ -7,11 +7,11 @@ HOMEPAGE="https://github.com/HaikuArchives/WakeUp"
 COPYRIGHT="1999 Jonathan Villemure"
 LICENSE="MIT"
 REVISION="2"
-gitSrcRevision="116afedea73ba9779d3d641028b65fdb2dc19012"
-SOURCE_URI="https://github.com/HaikuArchives/WakeUp/archive/$gitSrcRevision.tar.gz"
+srcGitRev="116afedea73ba9779d3d641028b65fdb2dc19012"
+SOURCE_URI="https://github.com/HaikuArchives/WakeUp/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="28eb8504a2a436a117821aaa399b8c37f5363bd9fcb2ff814f6cb1b6264da311"
-SOURCE_FILENAME="WakeUp-$gitSrcRevision.tar.gz"
-SOURCE_DIR="WakeUp-$gitSrcRevision"
+SOURCE_FILENAME="WakeUp-$srcGitRev.tar.gz"
+SOURCE_DIR="WakeUp-$srcGitRev"
 PATCHES="wakeup-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86_64"
diff --git a/haiku-apps/whereismymouse/whereismymouse-1.0.recipe b/haiku-apps/whereismymouse/whereismymouse-1.0.recipe
index c0decfc01..e529ee6b0 100644
--- a/haiku-apps/whereismymouse/whereismymouse-1.0.recipe
+++ b/haiku-apps/whereismymouse/whereismymouse-1.0.recipe
@@ -20,10 +20,10 @@ HOMEPAGE="https://github.com/HaikuArchives/WheresMyMouse"
 COPYRIGHT="2002 Marcin 'Shard' Konicki"
 LICENSE="MIT"
 REVISION="2"
-gitHash="b2a90328bb80ac564a83f23bc53871e4d1c0da3d"
-SOURCE_URI="https://github.com/HaikuArchives/WheresMyMouse/archive/$gitHash.tar.gz"
+srcGitRev="b2a90328bb80ac564a83f23bc53871e4d1c0da3d"
+SOURCE_URI="https://github.com/HaikuArchives/WheresMyMouse/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="8b6a98f3a6e31d7ec948d18463fd0a62736b2d18b5928ecf22e3d3b7c8bf0696"
-SOURCE_DIR="WheresMyMouse-$gitHash"
+SOURCE_DIR="WheresMyMouse-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/haiku-games/criticalmass/criticalmass-2.2.recipe b/haiku-games/criticalmass/criticalmass-2.2.recipe
index ed0d8eebc..42b1b529b 100644
--- a/haiku-games/criticalmass/criticalmass-2.2.recipe
+++ b/haiku-games/criticalmass/criticalmass-2.2.recipe
@@ -9,11 +9,11 @@ COPYRIGHT="1998 Hamish Carr
 	2011-2012 Adrien Destugues"
 LICENSE="CriticalMass"
 REVISION="1"
-commit="f597cad218830451f2ec7f5985bef23020bf28ec"
-SOURCE_URI="$HOMEPAGE/archive/$commit.tar.gz"
+srcGitRev="f597cad218830451f2ec7f5985bef23020bf28ec"
+SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="e53a980ec785ac14e67bf5d73013f2cd265cd7477315d1c36260fb72e97f6785"
-SOURCE_DIR="critical-mass-$commit"
-SOURCE_FILENAME="criticalmass-$commit.tar.gz"
+SOURCE_FILENAME="criticalmass-$srcGitRev.tar.gz"
+SOURCE_DIR="critical-mass-$srcGitRev"
 PATCHES="criticalmass-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 ?x86 x86_64"
diff --git a/haiku-games/guitarmaster/guitarmaster-1.0.0~git.recipe b/haiku-games/guitarmaster/guitarmaster-1.0.0~git.recipe
index ff3d1e913..00e2a6592 100644
--- a/haiku-games/guitarmaster/guitarmaster-1.0.0~git.recipe
+++ b/haiku-games/guitarmaster/guitarmaster-1.0.0~git.recipe
@@ -5,13 +5,13 @@ graphics in order to run on Haiku's software-GL.
 Usage: GuitarMaster [/path/to/songsDirectory]
 "
 HOMEPAGE="https://github.com/HaikuArchives/GuitarMaster/"
-LICENSE="MIT"
 COPYRIGHT="Toxic Labs 2008-2009"
+LICENSE="MIT"
 REVISION="2"
-gitCommit="51007c785e1504dbfe305beddf94aed8d699e25a"
-SOURCE_URI="$HOMEPAGE/archive/$gitCommit.tar.gz"
+srcGitRev="51007c785e1504dbfe305beddf94aed8d699e25a"
+SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="5993b48765c4fce050e0d7edb2eb771cd99f038941654af178308329ba7bd74b"
-SOURCE_DIR="GuitarMaster-$gitCommit"
+SOURCE_DIR="GuitarMaster-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 
@@ -19,7 +19,6 @@ PROVIDES="
 	guitarmaster = $portVersion
 	app:GuitarMaster = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	lib:libGL
diff --git a/haiku-games/puri/puri-0.3.9.1.recipe b/haiku-games/puri/puri-0.3.9.1.recipe
index 6c39918a1..2b7c730e2 100644
--- a/haiku-games/puri/puri-0.3.9.1.recipe
+++ b/haiku-games/puri/puri-0.3.9.1.recipe
@@ -5,11 +5,11 @@ HOMEPAGE="https://github.com/HaikuArchives/Puri/"
 COPYRIGHT="2010-2012 Haiku Inc."
 LICENSE="MIT"
 REVISION="2"
-gitCommit="7f94abc9e8022b3e25eb4563b7fe45a4db360dfb"
-SOURCE_URI="$HOMEPAGE/archive/$gitCommit.tar.gz"
+srcGitRev="7f94abc9e8022b3e25eb4563b7fe45a4db360dfb"
+SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="81956261b2e64ce26b481963b94d80c8512a73730d372669ee5a511309958121"
-SOURCE_DIR="Puri-$gitCommit"
-SOURCE_FILENAME="puri-$gitCommit.tar.gz"
+SOURCE_FILENAME="puri-$srcGitRev.tar.gz"
+SOURCE_DIR="Puri-$srcGitRev"
 PATCHES="puri-$portVersion.patchset"
 
 ARCHITECTURES="?x86 x86_64"
@@ -19,7 +19,6 @@ PROVIDES="
 	Puri$secondaryArchSuffix = $portVersion
 	app:Puri$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:lib3ds$secondaryArchSuffix
diff --git a/haiku-games/superfreecell/superfreecell-0.1.0.recipe b/haiku-games/superfreecell/superfreecell-0.1.0.recipe
index 24e3ee3d4..d07c5d9cd 100644
--- a/haiku-games/superfreecell/superfreecell-0.1.0.recipe
+++ b/haiku-games/superfreecell/superfreecell-0.1.0.recipe
@@ -6,10 +6,10 @@ HOMEPAGE="http://github.com/AdrianArroyoCalle/SuperFreeCell"
 COPYRIGHT="2014-2015 Adrián Arroyo Calle"
 LICENSE="MIT"
 REVISION="1"
-gitCommit="c2dc0320cfc3b461acae346ebf90e5b6501feb98"
-SOURCE_URI="$HOMEPAGE/archive/$gitCommit.tar.gz"
+srcGitRev="c2dc0320cfc3b461acae346ebf90e5b6501feb98"
+SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="af3668423e0f6fe19ac1efbcd6696046c1a492b616390222b140524ca9161a94"
-SOURCE_DIR="SuperFreeCell-$gitCommit"
+SOURCE_DIR="SuperFreeCell-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
diff --git a/haiku-libs/ale/ale-0.9.1.recipe b/haiku-libs/ale/ale-0.9.1.recipe
index 784fb4310..a11c510d4 100644
--- a/haiku-libs/ale/ale-0.9.1.recipe
+++ b/haiku-libs/ale/ale-0.9.1.recipe
@@ -15,14 +15,14 @@ https://www.cs.auckland.ac.nz/~lutteroth/publications/ZeidlerEtAl2013-AucklandLa
 or watch:
 http://www.youtube.com/watch?v=ZPv58AWWGRQ"
 HOMEPAGE="https://github.com/czeidler/ALEditor"
-srcGitRef="52a5a621e3c28fc04d46402fae263b9693bd68ab"
 COPYRIGHT="2009-2014 UniAuckland Team"
 LICENSE="MIT"
 REVISION="5"
-SOURCE_URI="https://github.com/czeidler/ALEditor/archive/$srcGitRef.tar.gz"
+srcGitRev="52a5a621e3c28fc04d46402fae263b9693bd68ab"
+SOURCE_URI="https://github.com/czeidler/ALEditor/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="cda6bc713485c058b326bc79231a99c24abad36e7d0b68a9cbbc2b292092e683"
-SOURCE_FILENAME="ALEditor-$srcGitRef.tar.gz"
-SOURCE_DIR="ALEditor-$srcGitRef"
+SOURCE_FILENAME="ALEditor-$srcGitRev.tar.gz"
+SOURCE_DIR="ALEditor-$srcGitRev"
 PATCHES="ale-$portVersion.patchset"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
@@ -35,6 +35,7 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	"
diff --git a/haiku-libs/libprefs/libprefs-1.2.5.recipe b/haiku-libs/libprefs/libprefs-1.2.5.recipe
index 37db8ad08..4ffca438c 100644
--- a/haiku-libs/libprefs/libprefs-1.2.5.recipe
+++ b/haiku-libs/libprefs/libprefs-1.2.5.recipe
@@ -15,7 +15,7 @@ SOURCE_DIR="libprefs125"
 PATCHES="libprefs-1.2.5.patch"
 
 ARCHITECTURES="x86_gcc2 !x86 !x86_64"
-SECONDARY_ACRHITECTURES="x86_gcc2 !x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 !x86"
 
 PROVIDES="
 	libprefs$secondaryArchSuffix = $portVersion
diff --git a/mail-client/mailnews/mailnews-2.0.0.25.recipe b/mail-client/mailnews/mailnews-2.0.0.25.recipe
index 778024b8c..2482a621f 100644
--- a/mail-client/mailnews/mailnews-2.0.0.25.recipe
+++ b/mail-client/mailnews/mailnews-2.0.0.25.recipe
@@ -6,10 +6,10 @@ HOMEPAGE="https://github.com/mmadia/bezilla"
 COPYRIGHT="1995-2009 Mozilla Developers and Contributors"
 LICENSE="MPL v1.1"
 REVISION="2"
-gitSrcRevision="6862542e81d0407f8fbdb8cf96a48fdc3156e902"
-SOURCE_URI="$HOMEPAGE/archive/$gitSrcRevision.tar.gz"
+srcGitRev="6862542e81d0407f8fbdb8cf96a48fdc3156e902"
+SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="ecdb6e15bd3a48e4b3e036e7fe3c12341c36ddef621403c558a15441cf364d79"
-SOURCE_DIR="bezilla-$gitSrcRevision"
+SOURCE_DIR="bezilla-$srcGitRev"
 PATCHES="mailnews-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86_64"