diff --git a/src/modules/debug/ee_mod_debug_wordpress_start.sh b/src/modules/debug/ee_mod_debug_wordpress_start.sh
deleted file mode 100644
index 04b96633..00000000
--- a/src/modules/debug/ee_mod_debug_wordpress_start.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-# Enables WordPress debug mode
-
-function ee_mod_debug_wordpress_start()
-{
-	if [ -e /var/www/$EE_DOMAIN/wp-config.php ]; then
-		grep "'WP_DEBUG'" /var/www/$EE_DOMAIN/wp-config.php | grep true &>> $EE_COMMAND_LOG
-		if [ $? -ne 0 ]; then
-			# Debug WordPress
-			ee_lib_echo "Start WordPress debug logs for $EE_DOMAIN"
-
-			# Create debug.log & change permission
-			touch /var/www/$EE_DOMAIN/htdocs/wp-content/debug.log
-			chown $EE_PHP_USER:$EE_PHP_USER /var/www/$EE_DOMAIN/htdocs/wp-content/debug.log
-		
-			# Turn on debug
-			sed -i "s/define('WP_DEBUG'.*/define('WP_DEBUG', true);\ndefine('WP_DEBUG_DISPLAY', false);\ndefine('WP_DEBUG_LOG', true);\ndefine('SAVEQUERIES', true);/" \
-			/var/www/$EE_DOMAIN/wp-config.php
-
-			# Install developer plugin
-			cd /var/www/$EE_DOMAIN/htdocs/
-			ee_lib_echo "Installing developer plugin, please wait..."
-			wp plugin --allow-root install developer &>> $EE_COMMAND_LOG \
-			|| ee_lib_error "Unable to install developer plugin, exit status = " $?
-		else
-			ee_lib_echo "WordPress debug log already started for $EE_DOMAIN"
-		fi
-	else
-		ee_lib_echo_fail "Unable to find wp-config.php file, seems like not WordPress site"
-	fi
-}
diff --git a/src/modules/debug/ee_mod_debug_wordpress_stop.sh b/src/modules/debug/ee_mod_debug_wordpress_stop.sh
deleted file mode 100644
index 0e184a98..00000000
--- a/src/modules/debug/ee_mod_debug_wordpress_stop.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Disables WordPress debug mode
-
-function ee_mod_debug_wordpress_stop()
-{
-	grep "'WP_DEBUG'" /var/www/$EE_DOMAIN/wp-config.php | grep true &>> $EE_COMMAND_LOG
-	if [ $? -eq 0 ]; then
-		# Stop debug WordPress
-		ee_lib_echo "Stopping WordPress debug logs for $EE_DOMAIN"
-		sed -i "s/define('WP_DEBUG', true);/define('WP_DEBUG', false);/" /var/www/$EE_DOMAIN/wp-config.php
-		sed -i "/define('WP_DEBUG_DISPLAY', false);/d" /var/www/$EE_DOMAIN/wp-config.php
-		sed -i "/define('WP_DEBUG_LOG', true);/d" /var/www/$EE_DOMAIN/wp-config.php
-		sed -i "/define('SAVEQUERIES', true);/d" /var/www/$EE_DOMAIN/wp-config.php
-	else
-		ee_lib_echo "WordPress debug log already stopped for $EE_DOMAIN"
-	fi
-}
diff --git a/src/modules/debug/ee_mod_debug_wp.sh b/src/modules/debug/ee_mod_debug_wp.sh
new file mode 100644
index 00000000..f53feee6
--- /dev/null
+++ b/src/modules/debug/ee_mod_debug_wp.sh
@@ -0,0 +1,53 @@
+# WordPress debug
+
+function ee_mod_debug_wp)()
+{
+	if [ "$1" = "start" ]; then
+		if [ -e /var/www/$EE_DOMAIN/wp-config.php ]; then
+			grep "'WP_DEBUG'" /var/www/$EE_DOMAIN/wp-config.php | grep true &>> $EE_COMMAND_LOG
+			if [ $? -ne 0 ]; then
+				ee_lib_echo "Enable WordPress debug logs for $EE_DOMAIN, please wait..."
+
+				# Create debug.log and fix permission
+				touch /var/www/$EE_DOMAIN/htdocs/wp-content/debug.log
+				chown $EE_PHP_USER:$EE_PHP_USER /var/www/$EE_DOMAIN/htdocs/wp-content/debug.log
+
+				# Turn on
+				sed -i "s/define('WP_DEBUG'.*/define('WP_DEBUG', true);\ndefine('WP_DEBUG_DISPLAY', false);\ndefine('WP_DEBUG_LOG', true);\ndefine('SAVEQUERIES', true);/" /var/www/$EE_DOMAIN/wp-config.php \
+				|| ee_lib_error "Unable to activate WordPress debug logs, exit status = " $?
+
+				# Install developer plugin
+				ee_lib_echo "Installing developer plugin, please wait..."
+				cd /var/www/$EE_DOMAIN/htdocs/ && \
+				wp plugin --allow-root install developer &>> $EE_COMMAND_LOG \
+				|| ee_lib_error "Unable to install developer plugin, exit status = " $?
+			else
+				# Display message
+				ee_lib_echo "WordPress debug log already enabled for $EE_DOMAIN"
+			fi
+		else
+			# Display message
+			ee_lib_echo_fail "Unable to find /var/www/$EE_DOMAIN/wp-config.php"
+		fi
+	elif [ "$1" = "stop" ]; then
+		if [ -e /var/www/$EE_DOMAIN/wp-config.php ]; then
+			grep "'WP_DEBUG'" /var/www/$EE_DOMAIN/wp-config.php | grep true &>> $EE_COMMAND_LOG
+			if [ $? -eq 0 ]; then
+				ee_lib_echo "Disable WordPress debug logs for $EE_DOMAIN, please wait..."
+
+				# Turn off
+				sed -i "s/define('WP_DEBUG', true);/define('WP_DEBUG', false);/" /var/www/$EE_DOMAIN/wp-config.php \
+				&& sed -i "/define('WP_DEBUG_DISPLAY', false);/d" /var/www/$EE_DOMAIN/wp-config.php \
+				&& sed -i "/define('WP_DEBUG_LOG', true);/d" /var/www/$EE_DOMAIN/wp-config.php \
+				&& sed -i "/define('SAVEQUERIES', true);/d" /var/www/$EE_DOMAIN/wp-config.php \
+				|| ee_lib_error "Unable to disable WordPress debug logs, exit status = " $?
+			else
+				# Display message
+				ee_lib_echo "WordPress debug log already disabled for $EE_DOMAIN"
+			fi
+		else
+			# Display message
+			ee_lib_echo_fail "Unable to find /var/www/$EE_DOMAIN/wp-config.php"
+		fi
+	fi
+}