diff --git a/change_network_gateway.sh b/change_network_gateway.sh
index 22a9419..1f41985 100755
--- a/change_network_gateway.sh
+++ b/change_network_gateway.sh
@@ -315,8 +315,8 @@ fi
 echo -en "\tDHCP Server settings.."
 files="dhcpd.conf.${network}
        dhcpd6.conf.${network}
-       hosts.lan.conf.${_network}
-       hosts.w-lan.conf.${_network}"
+       hosts.lan.conf.${network}
+       hosts.w-lan.conf.${network}"
 
 failed=false
 success=false
@@ -324,14 +324,14 @@ for file in $files ; do
    file_real_name="${file%.*}"
    if [[ -f "${base_dir}/${network}/$file" ]]; then
       if [[ -d /etc/dhcp ]]; then
-         cp -a ${base_dir}/${network}/$file /etc/dhcp/ > $logfile 2>&1
+         cp -a ${base_dir}/${network}/$file /etc/dhcp/$file_real_name > $logfile 2>&1
          if [[ "$?" = "0" ]]; then
             success=true
          else
             failed=true
          fi
       elif [[ -d /etc/dhcp3 ]] ;then
-         cp -a ${base_dir}/${network}/$file /etc/dhcp3/ > $logfile 2>&1
+         cp -a ${base_dir}/${network}/$file /etc/dhcp3/$file_real_name > $logfile 2>&1
          if [[ "$?" = "0" ]]; then
             success=true
          else
@@ -677,8 +677,8 @@ else
    fi
 fi
 
-if [ -f ${base_dir}/${network}/check_net.service.${_network} ] ; then
-   cp -a ${base_dir}/${network}/check_net.service.${_network} /etc/systemd/system/check_net.service >> $logfile 2>&1
+if [ -f ${base_dir}/${network}/check_net.service.${network} ] ; then
+   cp -a ${base_dir}/${network}/check_net.service.${network} /etc/systemd/system/check_net.service >> $logfile 2>&1
    if [ "$?" != "0" ]; then
       _rval=false
    fi
@@ -695,8 +695,8 @@ else
    fi
 fi
 
-if [[ -f "${base_dir}/${network}/check_net-logrotate.${_network}" ]]; then
-   cp -a ${base_dir}/${network}/check_net-logrotate.${_network} /etc/logrotated.d/check_net >> $logfile 2>&1
+if [[ -f "${base_dir}/${network}/check_net-logrotate.${network}" ]]; then
+   cp -a ${base_dir}/${network}/check_net-logrotate.${network} /etc/logrotated.d/check_net >> $logfile 2>&1
    if [ "$?" != "0" ]; then
       _rval=false
    fi