diff --git a/selected2folder/s2fLocalization.sh b/selected2folder/s2fLocalization.sh
index bbbb88f8779e08745936709f0b914962fa557152..da2ad5071db596b8af0339a8ade78230741269f8 100644
--- a/selected2folder/s2fLocalization.sh
+++ b/selected2folder/s2fLocalization.sh
@@ -27,7 +27,7 @@ function window_title()
     esac
 }
 
-function set_name()
+function window_message()
 {
     case "$first_locale" in
         "ru")
diff --git a/selected2folder/selected2folder.sh b/selected2folder/selected2folder.sh
index 6e0e3a82e42b1d25ba2fa62a07cff321ee809d31..b0e9fa1f7d4a7796feb7633c5490d79ff5488b3f 100755
--- a/selected2folder/selected2folder.sh
+++ b/selected2folder/selected2folder.sh
@@ -1,30 +1,25 @@
 #!/bin/bash
-
 . $HOME/.local/share/kservices5/ServiceMenus/s2fLocalization.sh
 
+function add_prefix_name() {
+    NUM=0
+    NEWNAME="$1"
+    while [ -d "$NEWNAME" ]
+        do
+            NUM="$(($NUM+1))"
+            NEWNAME="$1"\ "($NUM)"
+        done
+    printf "$NEWNAME"
+}
+function ask_name(){
+    kdialog --title "$(window_title)" --inputbox "$(window_message)" "$1" --icon "folder-add" --geometry 450x300
+}
 NAME="$(def_name)"
-if [ ! -d "$NAME" ]
-then
-NAME=`kdialog --title "$(window_title)" --inputbox "$(set_name)" "$NAME" --geometry 450x300`
-mkdir "$NAME" && cd "$NAME" && mv "$@"
-else
-NEWNAME=$NAME
-if [ ! -d "$NEWNAME" ]
-then
-mkdir "$NAME" && cd "$NAME" && mv "$@"
-else
-while [ -d "$NEWNAME" ]
-do
-NUM=0
-while [ -d "$NEWNAME" ]
-do
-NUM="$(($NUM+1))"
-NEWNAME="$NAME"\ "($NUM)"
-done
-NEWNAME=`kdialog --title "$(window_title)" --inputbox "$(set_name)" "$NEWNAME" --geometry 450x300`
-NAME=$NEWNAME
-done
-NAME=$NEWNAME
+NAME=$(add_prefix_name "$NAME")
+NAME="$(ask_name "$NAME")"
+while [ -d "$NAME" ]
+    do
+        NAME=$(add_prefix_name "$NAME")
+        NAME="$(ask_name "$NAME")"
+    done
 mkdir "$NAME" && cd "$NAME" && mv "$@"
-fi
-fi