diff --git a/build/jam/CheckRules b/build/jam/CheckRules
index bc3acea..aee11ae 100644
--- a/build/jam/CheckRules
+++ b/build/jam/CheckRules
@@ -33,13 +33,13 @@ rule CheckOpenSSL
 	OPENSSL_INCLUDE_DIR = ;
 	OPENSSL_LIBRARY_DIR = ;
 
-	local haveHeaders = [ Glob $(USER_INCLUDE_DIRECTORY)/openssl : ssl.h ] ;
+	local haveHeaders = [ Glob $(SYSTEM_INCLUDE_DIRECTORY)/openssl : ssl.h ] ;
 	if $(haveHeaders) {
-		OPENSSL_INCLUDE_DIR = $(USER_INCLUDE_DIRECTORY) ;
+		OPENSSL_INCLUDE_DIR = $(SYSTEM_INCLUDE_DIRECTORY) ;
 
-		local haveLibs = [ Glob $(USER_LIB_DIRECTORY) : libssl.so ] ;
+		local haveLibs = [ Glob $(SYSTEM_DEVELOP_LIB_DIRECTORY) : libssl.so ] ;
 		if $(haveLibs) {
-			OPENSSL_LIBRARY_DIR = $(USER_LIB_DIRECTORY) ;
+			OPENSSL_LIBRARY_DIR = $(SYSTEM_DEVELOP_LIB_DIRECTORY) ;
 
 			Echo OpenSSL Headers: $(OPENSSL_INCLUDE_DIR) ;
 			Echo OpenSSL Libs: $(OPENSSL_LIBRARY_DIR) ;
@@ -54,13 +54,13 @@ rule CheckExpat
 	EXPAT_INCLUDE_DIR = ;
 	EXPAT_LIBRARY_DIR = ;
 
-	local haveHeaders = [ Glob $(USER_INCLUDE_DIRECTORY)/ : expat.h ] ;
+	local haveHeaders = [ Glob $(SYSTEM_INCLUDE_DIRECTORY)/ : expat.h ] ;
 	if $(haveHeaders) {
-		EXPAT_INCLUDE_DIR = $(USER_INCLUDE_DIRECTORY)/ ;
+		EXPAT_INCLUDE_DIR = $(SYSTEM_INCLUDE_DIRECTORY)/ ;
 
-		local haveLibs = [ Glob $(USER_LIB_DIRECTORY) : libexpat.so ] ;
+		local haveLibs = [ Glob $(SYSTEM_DEVELOP_LIB_DIRECTORY) : libexpat.so ] ;
 		if $(haveLibs) {
-			EXPAT_LIBRARY_DIR = $(USER_LIB_DIRECTORY) ;
+			EXPAT_LIBRARY_DIR = $(SYSTEM_DEVELOP_LIB_DIRECTORY) ;
 
 			Echo Expat Headers: $(EXPAT_INCLUDE_DIR) ;
 			Echo Expat Libs: $(EXPAT_LIBRARY_DIR) ;
diff --git a/configure b/configure
index dd8aa72..ba01994 100755
--- a/configure
+++ b/configure
@@ -121,7 +121,8 @@ SETTYPE = ${settypebin} ;
 MIMESET = ${mimesetbin} ;
 SETVERSION = ${setversionbin} ;
 COPYATTR = ${copyattrbin} ;
- 
+
+#TODO common doesn't exists anymore, change COMMON to SYSTEM
 COMMON_BIN_DIRECTORY = $(finddir B_SYSTEM_BIN_DIRECTORY) ;
 COMMON_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ;
 COMMON_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ;
@@ -130,10 +131,10 @@ COMMON_ADDONS_DIRECTORY = $(finddir B_SYSTEM_ADDONS_DIRECTORY) ;
 COMMON_DEVELOP_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY) ;
 
 USER_CONFIG_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY) ;
-USER_INCLUDE_DIRECTORY = $(finddir B_USER_HEADERS_DIRECTORY) ;
-USER_LIB_DIRECTORY = $(finddir B_USER_DEVELOP_DIRECTORY)/lib ;
 
 SYSTEM_DIRECTORY = $(finddir B_SYSTEM_DIRECTORY) ;
+SYSTEM_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ;
+SYSTEM_DEVELOP_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ;
 SYSTEM_LIB_DIRECTORY = $(finddir B_SYSTEM_LIB_DIRECTORY) ;
 
 BEOS_PREFERENCES_DIRECTORY = $(finddir B_BEOS_PREFERENCES_DIRECTORY) ;