diff --git a/functions/functions b/functions/functions
index 94775d0..7dafd6e 100644
--- a/functions/functions
+++ b/functions/functions
@@ -547,6 +547,15 @@ MakeMgtFiles() {
                 SHNAME=$SHORTNAME
         else
                 SHNAME=`basename $MODULENAME`
+		if [ "$NoRewriteName" == "true" ]; then
+			SHNAME=`basename $MODULENAME`
+		else
+			SHNAME=`basename $MODULENAME|\
+			        sed -e "s/src/bin/" |\
+				sed -e "s/SRC/BIN/" |\
+				sed -e "s/SOURCE/BINARY/" |\
+				sed -e "s/source/binary/" `
+		fi
         fi
         find . -type d -ls|\
         awk '{ if ( $11 != "." ) print $3,$5,$6,$11 }' |\
diff --git a/genpkg b/genpkg
index e8ea163..1f122ee 100755
--- a/genpkg
+++ b/genpkg
@@ -382,7 +382,16 @@ pkggen() {
 		if [ "$SHORTNAME" ]; then
 			echo "ModuleName: $SHORTNAME" >$METAFILE
 		else
-			echo "ModuleName: `basename $MODULENAME`" >$METAFILE
+			if [ "$NoRewriteName" == "true" ]; then
+				SHORTNAME=`basename $MODULENAME`
+			else
+				SHORTNAME=`basename $MODULENAME| \
+					   sed -e "s/src/bin/" |\
+					   sed -e "s/SRC/BIN/" |\
+					   sed -e "s/SOURCE/BINARY/"|\
+					   sed -e "s/source/binary/"`
+			fi
+			echo "ModuleName: `basename $SHORTNAME`" >$METAFILE
 		fi
 		echo "BuildDate: `date +%Y%m%d`" >>$METAFILE
 		echo -n "Module Version:" >>$METAFILE