diff --git a/build_key-pass.sh b/build_key-pass.sh
index c117b66..17d56ef 100755
--- a/build_key-pass.sh
+++ b/build_key-pass.sh
@@ -800,11 +800,11 @@ if $_copy_to_user_home_dir ; then
    if [[ $? -ne 0 ]] ; then
       _failed=true
    fi
-   cp -a "${_CA_CERT}" "${_target_dir}" >> $log_file 2>&1
+   cp -a "${_CA_CERT}" "${_target_dir}/VPN-${ORG_SHORTCUT}-$(basename ${_CA_CERT})" >> $log_file 2>&1
    if [[ $? -ne 0 ]] ; then
       _failed=true
    fi
-   cp -a "${_TA_KEY}" "${_target_dir}" >> $log_file 2>&1
+   cp -a "${_TA_KEY}" "${_target_dir}/VPN-${ORG_SHORTCUT}-$(basename ${_TA_KEY})" >> $log_file 2>&1
    if [[ $? -ne 0 ]] ; then
       _failed=true
    fi
diff --git a/create_key_config.sh b/create_key_config.sh
index c55ebcc..b3cf7ca 100755
--- a/create_key_config.sh
+++ b/create_key_config.sh
@@ -676,6 +676,9 @@ fi
 if [[ $? -ne 0 ]] ; then
    _failed=true
 fi
+
+# - For historical reasons
+# -
 cp -a "$_client_conf_file" "${_target_dir}/client-$(basename $_client_conf_file)" >> $log_file 2>&1
 if [[ $? -ne 0 ]] ; then
    _failed=true