diff --git a/src/modules/site/ee_mod_site_backup.sh b/src/modules/site/ee_mod_site_backup.sh
index 88b28d38..81dded0c 100644
--- a/src/modules/site/ee_mod_site_backup.sh
+++ b/src/modules/site/ee_mod_site_backup.sh
@@ -5,26 +5,26 @@ function ee_mod_site_backup()
 		
 		# Backup directory setup
 		local ee_webroot=$(grep root /etc/nginx/sites-available/$EE_DOMAIN | awk '{ print $2 }' | sed 's/;//g' | sed 's/\/htdocs//')
-		if [ ! -d $ee_webroot/backup ] || [ ! -d $ee_webroot/backup/htdocs/$EE_DATE ] || [ ! -d $ee_webroot/backup/nginx ] || [ ! -d $ee_webroot/backup/db ]; then
+		if [ ! -d $ee_webroot/backup ] || [ ! -d $ee_webroot/backup/htdocs/$EE_DATE ] || [ ! -d $ee_webroot/backup/nginx/$EE_DATE ] || [ ! -d $ee_webroot/backup/db/$EE_DATE ]; then
 			mkdir -p 	$ee_webroot/backup/{htdocs/$EE_DATE,nginx,db} || ee_lib_error "Unable to create $ee_webroot/backup directory, exit status =" $?
 		fi
 
 		# Move htdocs
 		if [ "$EE_SITE_CURRENT_OPTION" = "HTML" ] || [ "$EE_SITE_CURRENT_OPTION" = "MYSQL" ] || [ "$EE_SITE_CURRENT_OPTION" = "PHP" ]; then
-			ee_lib_echo "Creating Webroot backup for $EE_DOMAIN, please wait..."
+			ee_lib_echo "Backup webroot at $ee_webroot/backup/htdocs/$EE_DATE/, please wait..."
 			mv $ee_webroot/htdocs $ee_webroot/backup/htdocs/$EE_DATE/ || ee_lib_error "Unable to move $ee_webroot/htdocs to backup, exit status =" $?
 			mkdir -p $ee_webroot/htdocs
 		fi
 
-		ee_lib_echo "Creating NGINX configuration backup for $EE_DOMAIN, please wait..."
+		ee_lib_echo "Backup NGINX configuration at $ee_webroot/backup/nginx/$EE_DATE/, please wait..."
 		# Backup $EE_DOMAIN NGINX configuration
-		cp /etc/nginx/sites-available/$EE_DOMAIN $ee_webroot/backup/nginx/${EE_DOMAIN}-$EE_DATE.conf &>> $EE_COMMAND_LOG
+		cp /etc/nginx/sites-available/$EE_DOMAIN $ee_webroot/backup/nginx/$EE_DATE/ &>> $EE_COMMAND_LOG
 
 		# Database backup
 		if [ -f $(grep root /etc/nginx/sites-available/$EE_DOMAIN | awk '{ print $2 }' | sed 's/;//g' | sed 's/htdocs/*-config.php/') ]; then
-			ee_lib_echo "Creating Database backup for $EE_DOMAIN, please wait..."
 			local ee_db_name=$(grep DB_NAME $(grep root /etc/nginx/sites-available/$EE_DOMAIN | awk '{ print $2 }' | sed 's/;//g' | sed 's/htdocs/*-config.php/' 2> /dev/null) | cut -d"'" -f4)
-			mysqldump $ee_db_name > $ee_webroot/backup/db/${ee_db_name}-$EE_DATE.sql \
+			ee_lib_echo "Backup Database $ee_db_name at $ee_webroot/backup/db/$EE_DATE/, please wait..."
+			mysqldump $ee_db_name > $ee_webroot/backup/db/$EE_DATE/${ee_db_name}.sql \
 			|| ee_lib_error "Unable to dump ${ee_db_name}, exit status =" $?
 
 			# Move ee-config.php and copy wp-config.php to backup
diff --git a/src/modules/site/update/ee_mod_update_domain.sh b/src/modules/site/update/ee_mod_update_domain.sh
index a6f0d1cb..00d4224c 100644
--- a/src/modules/site/update/ee_mod_update_domain.sh
+++ b/src/modules/site/update/ee_mod_update_domain.sh
@@ -8,7 +8,7 @@ function ee_mod_update_domain()
 		ee_mod_site_backup
 		
 		# Creating $EE_DOMAIN
-		ee_lib_echo "Updating $EE_DOMAIN, please wait ..."
+		ee_lib_echo "Updating $EE_DOMAIN, please wait..."
 		if [ -f /etc/nginx/sites-available/$EE_DOMAIN ]; then 
 			EE_SITE_CURRENT_CONF=$(head -n1 /etc/nginx/sites-available/$EE_DOMAIN | grep "NGINX CONFIGURATION")
 			EE_SITE_UPDATE_CONF=$(head -n1 /usr/share/easyengine/nginx/$EE_NGINX_CONF | grep "NGINX CONFIGURATION")