diff --git a/git-get-repo-and-build.sh b/git-get-repo-and-build.sh
index bed3ca2..d53aaa4 100755
--- a/git-get-repo-and-build.sh
+++ b/git-get-repo-and-build.sh
@@ -30,7 +30,7 @@ while read -r line || [[ -n "$line" ]]; do
 done < "$inifilename"
 
 if [[ -z $1  && -z $2 ]] ; then
-	echo "get-repo-and-build.sh <organisation> <reponame> [<local>]"
+	echo "get-repo-and-build.sh <reponame> <organisation> [<local>]"
 	exit 0
 fi
 
@@ -49,8 +49,8 @@ if [ $3 ] ; then
 	ACCESSTOKEN=${local_GITEAACCESSTOKEN}
     fi
 fi
-ORG_NAME="$1"
-REPO_NAME="$2"
+ORG_NAME="$2"
+REPO_NAME="$1"
 if [[ $smegit_WORKDIR == ~* ]] ; then
     # relative to users home dir
     WORKDIR=$(echo ~)${smegit_WORKDIR:1}
@@ -78,7 +78,7 @@ if [ ! -e $GITFiles/common ]; then
   cd $GITFiles
   git clone "${smegit_COMMONREPO}"
   if [ ! -e $GITFiles/common ]; then
-    echo "ERROR*******No Common Repo found - package $1"
+    echo "ERROR*******No Common Repo found - package $REPO_NAME"
     exit 1
   fi
 else
@@ -93,10 +93,10 @@ chmod +x $GITFiles/common/make-archive.sh
 # See if repo exits in git
 RESPONSE=$(curl $curlsilent -o /dev/null -w "%{http_code}" "$GITEAHOST/api/v1/repos/$ORG_NAME/$REPO_NAME")
 if [ "$RESPONSE" == "200" ]; then
-    if [ $DEBUG ] ; then echo "Repository for $1/$2 exists!" ; fi
+    if [ $DEBUG ] ; then echo "Repository for $ORG_NAME/$REPO_NAME exists!" ; fi
 else
-    if [ $DEBUG ] ; then echo "Repository for $1/$2 does not exist" ; fi
-	logname="git-cvs2git-create-$2-$1-$(date +'%FT%H%M').log"
+    if [ $DEBUG ] ; then echo "Repository for $ORG_NAME/$REPO_NAME does not exist" ; fi
+	logname="git-cvs2git-create-$ORG_NAME-$REPO_NAME-$(date +'%FT%H%M').log"
 	while true; do
 		read -p "Do you wish to run git-cvs2git?(y/n) " yn
 		case $yn in
@@ -108,9 +108,9 @@ else
 	# And check it is now there
 	RESPONSE=$(curl $curlsilent -o /dev/null -w "%{http_code}" "$GITEAHOST/api/v1/repos/$ORG_NAME/$REPO_NAME")
 	if [ "$RESPONSE" == "200" ]; then
-		if [ $DEBUG ] ; then echo "Repository for $1/$2 created sucessfully!" ; fi
+		if [ $DEBUG ] ; then echo "Repository for $ORG_NAME/$REPO_NAME created sucessfully!" ; fi
 	else
-		echo "git-cvs2git.sh was unable to create $1/$2 sucessfully"
+		echo "git-cvs2git.sh was unable to create $ORG_NAME/$REPO_NAME sucessfully"
 		exit 1
 	fi
 fi
@@ -135,13 +135,13 @@ if [[ ! -d $REPO_NAME ]] ; then
 fi
 cd $GITFiles/$REPO_NAME
 # and run mockbuild
-logname="mockbuild-$2-$1-$(date +'%FT%H%M').log"
+logname="mockbuild-$ORG_NAME-$REPO_NAME-$(date +'%FT%H%M').log"
 if make mockbuild 2>&1 > $logname ; then 
-	echo "Looks like mockbuild worked for $1/$2"
-	echo "$(date +'%FT%H%M') Mockbuild worked for $1/$2 " >> $GITFiles/mockbuilds.log
+	echo "Looks like mockbuild worked for $ORG_NAME/$REPO_NAME"
+	echo "$(date +'%FT%H%M') Mockbuild worked for $ORG_NAME/$REPO_NAME " >> $GITFiles/mockbuilds.log
 else
 	echo "Mockbuild failed"
-	echo "$(date +'%FT%H%M') Mockbuild failed for $1/$2 " >> $GITFiles/mockbuilds.log
+	echo "$(date +'%FT%H%M') Mockbuild failed for $ORG_NAME/$REPO_NAME " >> $GITFiles/mockbuilds.log
 	exit 1
 fi