diff --git a/build_key-pass.sh b/build_key-pass.sh
index 333ee5c..5dd19de 100755
--- a/build_key-pass.sh
+++ b/build_key-pass.sh
@@ -643,11 +643,11 @@ if $_copy_to_user_home_dir ; then
 
    if [[ -n "$ORG_SHORTCUT" ]]; then
       cp -a "$_client_conf_file" \
-         "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}/client-${ORG_SHORTCUT}-$(basename $_client_conf_file)" \
+         "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}/${ORG_SHORTCUT}-$(basename $_client_conf_file)" \
           >> $log_file 2>&1
    else
       cp -a "$_client_conf_file" \
-         "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}/client-${KEY_CN/VPN-/}-$(basename $_client_conf_file)" \
+         "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}/${KEY_CN/VPN-/}-$(basename $_client_conf_file)" \
          >> $log_file 2>&1
    fi
    if [[ $? -ne 0 ]] ; then
diff --git a/create_key_config.sh b/create_key_config.sh
index de89c4e..b884643 100755
--- a/create_key_config.sh
+++ b/create_key_config.sh
@@ -598,9 +598,9 @@ if [[ $? -ne 0 ]] ; then
    _failed=true
 fi
 if [[ -n "$ORG_SHORTCUT" ]]; then
-   cp -a "$_client_conf_file" "${target_dir}/${KEY_CN}-${NEW_KEY_NAME}/client-${ORG_SHORTCUT}-${NEW_KEY_NAME}.conf"
+   cp -a "$_client_conf_file" "${target_dir}/${KEY_CN}-${NEW_KEY_NAME}/${ORG_SHORTCUT}-${NEW_KEY_NAME}.conf"
 else
-   cp -a "$_client_conf_file" "${target_dir}/${KEY_CN}-${NEW_KEY_NAME}/client-${KEY_CN/VPN-/}-${NEW_KEY_NAME}.conf"
+   cp -a "$_client_conf_file" "${target_dir}/${KEY_CN}-${NEW_KEY_NAME}/${KEY_CN/VPN-/}-${NEW_KEY_NAME}.conf"
 fi
 if [[ $? -ne 0 ]] ; then
    _failed=true