diff --git a/configure/CONFIG b/configure/CONFIG
index 52c0aa1e0..076606be3 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -68,12 +68,12 @@ endif
 #STATIC_BUILD=NO
 #  Host build optimization,   must be either YES or NO
 #HOST_OPT=YES
-#  Ioc build optimization,  must be either YES or NO
-#IOC_OPT=YES
+#  Cross build optimization,  must be either YES or NO
+#CROSS_OPT=YES
 #  Generate Verbose Compiler Warnings for host build,  must be either YES or NO
 #HOST_WARN=YES
-#  Generate Verbose Compiler Warnings for ioc builds,  must be either YES or NO
-#IOC_WARN=YES
+#  Generate Verbose Compiler Warnings for cross compile builds,  must be either YES or NO
+#CROSS_WARN=YES
 #etc.
 
 #CROSS_COMPILER_TARGET_ARCHS=mv167
diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index 3afcfd358..d273ca3e5 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -204,16 +204,12 @@ INSTALL_DBDFLAGS = -I $(INSTALL_LOCATION)/dbd
 #####POSIX_FLAGS = $(POSIX_FLAGS_$(POSIX))
 
 #--------------------------------------------------
-# Warnings flags  (CONFIG.<arch> will override)
-# final value determined in RULES_BUILD
-WARN=$(HOST_WARN)
+# Warnings flags
 WARN_CFLAGS = $($(ANSI)_WARN_$(WARN))
 WARN_CXXFLAGS = $($(CPLUSPLUS)_WARN_$(WARN))
 
 #--------------------------------------------------
-# Optimization flags  (CONFIG.<arch> will override)
-# final value determined in RULES_BUILD
-OPT=$(HOST_OPT)
+# Optimization flags
 OPT_CFLAGS = $($(ANSI)_OPT_$(OPT))
 OPT_CXXFLAGS = $($(CPLUSPLUS)_OPT_$(OPT))
 OPT_LDFLAGS =
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index aa486ccce..6af96d6b1 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -96,14 +96,14 @@ STATIC_BUILD=NO
 #	must be either YES or NO
 HOST_OPT=YES
 
-#  Ioc build optimization
+#  Cross build optimization
 #	must be either YES or NO
-IOC_OPT=YES
+CROSS_OPT=YES
 
 #  Generate Verbose Compiler Warnings for Host builds
 #	must be either YES or NO
 HOST_WARN=YES
 
-#  Generate Verbose Compiler Warnings for Ioc builds
+#  Generate Verbose Compiler Warnings for cross compile builds
 #	must be either YES or NO
-IOC_WARN=YES
+CROSS_WARN=YES