diff --git a/completion/fish-completion.fish b/completion/fish-completion.fish
index 08b42c48..82995641 100644
--- a/completion/fish-completion.fish
+++ b/completion/fish-completion.fish
@@ -13,11 +13,11 @@ end
 
 
 if test -d $systempath
-	set -g systemponies (ls --color=no $systempath | sed 's/\.pony//')
+	set -g systemponies (ls --color=no $systempath | sed -e 's/\.pony//' -e 's/_.*//' | perl -pe 's/([a-z])([A-Z])/\1\\\ \2/' )
 end
 
 if test -d $homepath
-	set -g homeponies   (ls --color=no $homepath | sed 's/\.pony//')
+	set -g homeponies   (ls --color=no $systempath | sed -e 's/\.pony//' -e 's/_.*//' | perl -pe 's/([a-z])([A-Z])/\1\\\ \2/' )
 end
 
 
diff --git a/ponysay b/ponysay
index c856fd20..0d84cd80 100755
--- a/ponysay
+++ b/ponysay
@@ -270,7 +270,7 @@ while getopts $opts OPT; do
 	case ${OPT} in
 		v)  version; exit ;;
 		h)  usage; exit ;;
-		f)  ponies+=( "$OPTARG" ) ;;
+		f)  ponies+=($(echo $OPTARG | sed -e 's/ //g')) ;;
 		l)  list; exit ;;
 		L)  linklist; exit ;;
 		W)  wrap="$OPTARG" ;;
diff --git a/ponysaylist.pl b/ponysaylist.pl
index 7a093768..72c0a920 100755
--- a/ponysaylist.pl
+++ b/ponysaylist.pl
@@ -15,6 +15,10 @@ $maxw = 1;
 
 foreach $arg (@ARGV)
 {
+	# Format names from ponyies names
+	$arg =~ s/([a-z])([A-Z])/\1 \2/;
+	$arg =~ s/_(.*)/\t(\1)/;
+	
     if ($first == 1)
     {   $first = 0;
 	$scrw = $arg;