diff --git a/etc/bash_completion.d/ee b/etc/bash_completion.d/ee
index 8cf11f8f..0e6a34f9 100644
--- a/etc/bash_completion.d/ee
+++ b/etc/bash_completion.d/ee
@@ -67,11 +67,11 @@ EEAUTO()
 			;;
 
 		create|update)
-			COMPREPLY=( $( compgen -W "html php wpsingle wpsubdir wpsubdomain" -- $CURRENT ) )
+			COMPREPLY=( $( compgen -W "html php wp wpsubdir wpsubdomain" -- $CURRENT ) )
 			return 0
 			;;
 
-		wpsingle|wpsubdir|wpsubdomain)
+		wp|wpsubdir|wpsubdomain)
 			COMPREPLY=( $( compgen -W "basic w3tc wpsc wpfc" -- $CURRENT ) )
 			return 0
 			;;
diff --git a/usr/local/sbin/easyengine b/usr/local/sbin/easyengine
index 87ac9c29..90de3abd 100755
--- a/usr/local/sbin/easyengine
+++ b/usr/local/sbin/easyengine
@@ -1199,7 +1199,7 @@ then
 			EESITENAME
 
 			# Creating Website $DOMAIN
-			NGINXCONF=wpsingle/basic.conf
+			NGINXCONF=wp/basic.conf
 			EEDOMAINSETUP
 			EEPERMISSION
 
@@ -1211,7 +1211,7 @@ then
 			# Display Success Message
 			echo -e "\033[34m http://$DOMAIN Domain Successfully Created \e[0m"
 
-		elif [ "$3" = "wpsingle" ]
+		elif [ "$3" = "wp" ]
 		then
 
 			if [ "$4" = "basic" ]
diff --git a/usr/share/easyengine/nginx/wpsingle/basic.conf b/usr/share/easyengine/nginx/wp/basic.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wpsingle/basic.conf
rename to usr/share/easyengine/nginx/wp/basic.conf
diff --git a/usr/share/easyengine/nginx/wpsingle/w3tc.conf b/usr/share/easyengine/nginx/wp/w3tc.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wpsingle/w3tc.conf
rename to usr/share/easyengine/nginx/wp/w3tc.conf
diff --git a/usr/share/easyengine/nginx/wpsingle/wpfc.conf b/usr/share/easyengine/nginx/wp/wpfc.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wpsingle/wpfc.conf
rename to usr/share/easyengine/nginx/wp/wpfc.conf
diff --git a/usr/share/easyengine/nginx/wpsingle/wpsc.conf b/usr/share/easyengine/nginx/wp/wpsc.conf
similarity index 100%
rename from usr/share/easyengine/nginx/wpsingle/wpsc.conf
rename to usr/share/easyengine/nginx/wp/wpsc.conf