diff --git a/wolf_scripts/generic_func/functions.sh b/wolf_scripts/generic_func/functions.sh
index 57da3bbfdd1b3f7f22e0695576743fd1513b4352..f5c89a80b92f3ce88e04ec848b5e1ac9f7dfa467 100755
--- a/wolf_scripts/generic_func/functions.sh
+++ b/wolf_scripts/generic_func/functions.sh
@@ -12,7 +12,7 @@ NC=$(tput sgr 0) # No Color
 
 askIfGitBranch()
 {
- read -p "${CYAN}Do you want to create a new git branch(Y/n)?  ${NC}" ANSWER
+ read -p "${CYAN}Do you want to create a new git branch (y/n)?  ${NC}" ANSWER
  DOIT=${ANSWER:-y}
  OK=0
  
diff --git a/wolf_scripts/generic_func/user_menu.sh b/wolf_scripts/generic_func/user_menu.sh
index c472afa3e9f0fead8818071dc6167cc402209d55..f873d755b7fcbcd8ede51d52af06d0ceefc22dda 100755
--- a/wolf_scripts/generic_func/user_menu.sh
+++ b/wolf_scripts/generic_func/user_menu.sh
@@ -92,3 +92,8 @@ if ! [[ $BASE =~ $TYPE ]] ;
 then
     BASE="$TYPE"_"$BASE";
 fi
+
+if ! [[ $CLASSNAME =~ .*BASE*. ]] ;
+then
+	CLASSNAME=${CLASSNAME//Base}  # Replace Base with nothing
+fi