diff --git a/VERSION b/VERSION
index 7d5e66898..143ea50c4 100644
--- a/VERSION
+++ b/VERSION
@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
 # build number is like "nano" version number. I am incrementing build
 # number during development cycle
 #
-BUILD_NUM="3465"
+BUILD_NUM="3466"
 
 VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
 
diff --git a/VERSION.h b/VERSION.h
index 31efbecdb..f04ac3d58 100644
--- a/VERSION.h
+++ b/VERSION.h
@@ -1,2 +1,2 @@
-#define VERSION      "4.2.0.3465"
+#define VERSION      "4.2.0.3466"
 #define GENERATION   "4.2"
diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec
index d2328597d..50245ab41 100644
--- a/packaging/fwbuilder-static-qt.spec
+++ b/packaging/fwbuilder-static-qt.spec
@@ -3,7 +3,7 @@
 
 
 %define name    fwbuilder
-%define version 4.2.0.3465
+%define version 4.2.0.3466
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control
index dc55910a0..8a0c7f844 100644
--- a/packaging/fwbuilder.control
+++ b/packaging/fwbuilder.control
@@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
 Priority: extra
 Section: checkinstall
 Maintainer: vadim@fwbuilder.org
-Version: 4.2.0.3465-1
+Version: 4.2.0.3466-1
 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
 Description: Firewall Builder GUI and policy compilers
diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec
index 0c25fba31..ae64ca6aa 100644
--- a/packaging/fwbuilder.spec
+++ b/packaging/fwbuilder.spec
@@ -1,6 +1,6 @@
 
 %define name    fwbuilder
-%define version 4.2.0.3465
+%define version 4.2.0.3466
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/src/cisco_lib/CompilerDriver_iosacl_run.cpp b/src/cisco_lib/CompilerDriver_iosacl_run.cpp
index 876cd17de..4e383ed4f 100644
--- a/src/cisco_lib/CompilerDriver_iosacl_run.cpp
+++ b/src/cisco_lib/CompilerDriver_iosacl_run.cpp
@@ -378,7 +378,7 @@ QString CompilerDriver_iosacl::run(const std::string &cluster_id,
     }
     catch (FWException &ex)
     {
-        status = BaseCompiler::ERROR;
+        status = BaseCompiler::FWCOMPILER_ERROR;
         return QString::fromUtf8(ex.toString().c_str());
     }
 
diff --git a/src/cisco_lib/CompilerDriver_pix_run.cpp b/src/cisco_lib/CompilerDriver_pix_run.cpp
index 1022a6130..f174da1c2 100644
--- a/src/cisco_lib/CompilerDriver_pix_run.cpp
+++ b/src/cisco_lib/CompilerDriver_pix_run.cpp
@@ -535,7 +535,7 @@ QString CompilerDriver_pix::run(const std::string &cluster_id,
     }
     catch (FWException &ex)
     {
-        status = BaseCompiler::ERROR;
+        status = BaseCompiler::FWCOMPILER_ERROR;
         return QString::fromUtf8(ex.toString().c_str());
     }
 
diff --git a/src/cisco_lib/CompilerDriver_procurve_acl_run.cpp b/src/cisco_lib/CompilerDriver_procurve_acl_run.cpp
index 59b9ad586..ea7c72158 100644
--- a/src/cisco_lib/CompilerDriver_procurve_acl_run.cpp
+++ b/src/cisco_lib/CompilerDriver_procurve_acl_run.cpp
@@ -366,7 +366,7 @@ QString CompilerDriver_procurve_acl::run(const std::string &cluster_id,
     }
     catch (FWException &ex)
     {
-        status = BaseCompiler::ERROR;
+        status = BaseCompiler::FWCOMPILER_ERROR;
         return QString::fromUtf8(ex.toString().c_str());
     }
 
diff --git a/src/iosacl/iosacl.cpp b/src/iosacl/iosacl.cpp
index 0cb3b8667..4cae9049c 100644
--- a/src/iosacl/iosacl.cpp
+++ b/src/iosacl/iosacl.cpp
@@ -162,7 +162,7 @@ int main(int argc, char **argv)
 
         driver.compile();
         delete objdb;
-        return (driver.getStatus() == BaseCompiler::SUCCESS) ? 0 : 1;
+        return (driver.getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1;
         
     } catch(libfwbuilder::FWException &ex)
     {
diff --git a/src/ipf/ipf.cpp b/src/ipf/ipf.cpp
index fe7c38e3a..de0c30ecd 100644
--- a/src/ipf/ipf.cpp
+++ b/src/ipf/ipf.cpp
@@ -175,7 +175,7 @@ int main(int argc, char **argv)
         }
         driver.compile();
         delete objdb;
-        return (driver.getStatus() == BaseCompiler::SUCCESS) ? 0 : 1;
+        return (driver.getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1;
 
     } catch(const FWException &ex)  {
 	cerr << ex.toString() << endl;
diff --git a/src/ipfw/ipfw.cpp b/src/ipfw/ipfw.cpp
index eda806638..593b0fc88 100644
--- a/src/ipfw/ipfw.cpp
+++ b/src/ipfw/ipfw.cpp
@@ -171,7 +171,7 @@ int main(int argc, char **argv)
         }
         driver.compile();
         delete objdb;
-        return (driver.getStatus() == BaseCompiler::SUCCESS) ? 0 : 1;
+        return (driver.getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1;
 
     } catch(const FWException &ex)
     {
diff --git a/src/ipt/ipt.cpp b/src/ipt/ipt.cpp
index a7988e23c..2ebbe8631 100644
--- a/src/ipt/ipt.cpp
+++ b/src/ipt/ipt.cpp
@@ -152,7 +152,7 @@ int main(int argc, char **argv)
         }
         driver.compile();
         delete objdb;
-        return (driver.getStatus() == BaseCompiler::SUCCESS) ? 0 : 1;
+        return (driver.getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1;
 
     } catch(const FWException &ex) 
     {
diff --git a/src/iptlib/CompilerDriver_ipt_run.cpp b/src/iptlib/CompilerDriver_ipt_run.cpp
index 4e830cf31..e399c1a1e 100644
--- a/src/iptlib/CompilerDriver_ipt_run.cpp
+++ b/src/iptlib/CompilerDriver_ipt_run.cpp
@@ -746,7 +746,7 @@ QString CompilerDriver_ipt::run(const std::string &cluster_id,
     }
     catch (FWException &ex)
     {
-        status = BaseCompiler::ERROR;
+        status = BaseCompiler::FWCOMPILER_ERROR;
         return QString::fromUtf8(ex.toString().c_str());
     }
     
diff --git a/src/libfwbuilder/src/fwcompiler/BaseCompiler.cpp b/src/libfwbuilder/src/fwcompiler/BaseCompiler.cpp
index 548775400..091a7108e 100644
--- a/src/libfwbuilder/src/fwcompiler/BaseCompiler.cpp
+++ b/src/libfwbuilder/src/fwcompiler/BaseCompiler.cpp
@@ -152,7 +152,7 @@ void BaseCompiler::abort(const string &errstr) throw(FWException)
     printError(errstr);
     if (inEmbeddedMode())
         throw FatalErrorInSingleRuleCompileMode(errors_buffer.str());
-    status = ERROR;
+    status = FWCOMPILER_ERROR;
     if (test_mode) return;
     throw FWException("Fatal error");
 }
@@ -165,14 +165,14 @@ void BaseCompiler::abort(FWObject *fw,
     message("error", fw, ruleset, rule, errstr);
     if (inEmbeddedMode())
         throw FatalErrorInSingleRuleCompileMode(errors_buffer.str());
-    status = ERROR;
+    status = FWCOMPILER_ERROR;
     if (test_mode) return;
     throw FWException("Fatal error");
 }
 
 void BaseCompiler::error(const string &str)
 {
-    status = ERROR;
+    status = FWCOMPILER_ERROR;
     printError(str);
 }
 
@@ -181,7 +181,7 @@ void BaseCompiler::error(FWObject *fw,
                          FWObject *rule,
                          const string &errstr)
 {
-    status = ERROR;
+    status = FWCOMPILER_ERROR;
     message("error", fw, ruleset, rule, errstr);
 }
 
diff --git a/src/libfwbuilder/src/fwcompiler/BaseCompiler.h b/src/libfwbuilder/src/fwcompiler/BaseCompiler.h
index 2993175bd..a533a9067 100644
--- a/src/libfwbuilder/src/fwcompiler/BaseCompiler.h
+++ b/src/libfwbuilder/src/fwcompiler/BaseCompiler.h
@@ -75,7 +75,7 @@ namespace fwcompiler {
                      const std::string &errstr);
         
 public:
-        typedef enum {SUCCESS, ERROR} termination_status;
+        typedef enum {FWCOMPILER_SUCCESS, FWCOMPILER_ERROR} termination_status;
 
 protected:
         termination_status status;
@@ -132,7 +132,7 @@ public:
             test_mode = false;
             embedded_mode = false;
             level_macro = "%LEVEL%";
-            status = SUCCESS;
+            status = FWCOMPILER_SUCCESS;
         };
 
 	std::string getErrors(const std::string &comment_sep);
diff --git a/src/pf/pf.cpp b/src/pf/pf.cpp
index 1831214d7..5a5924dad 100644
--- a/src/pf/pf.cpp
+++ b/src/pf/pf.cpp
@@ -155,7 +155,7 @@ int main(int argc, char **argv)
         }
         driver.compile();
         delete objdb;
-        return (driver.getStatus() == BaseCompiler::SUCCESS) ? 0 : 1;
+        return (driver.getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1;
 
     } catch(const FWException &ex)
     {
diff --git a/src/pflib/CompilerDriver_ipf_run.cpp b/src/pflib/CompilerDriver_ipf_run.cpp
index ccb85a7b2..902466bbb 100644
--- a/src/pflib/CompilerDriver_ipf_run.cpp
+++ b/src/pflib/CompilerDriver_ipf_run.cpp
@@ -416,7 +416,7 @@ QString CompilerDriver_ipf::run(const std::string &cluster_id,
     }
     catch (FWException &ex)
     {
-        status = BaseCompiler::ERROR;
+        status = BaseCompiler::FWCOMPILER_ERROR;
         return QString::fromUtf8(ex.toString().c_str());
     }
     
diff --git a/src/pflib/CompilerDriver_ipfw_run.cpp b/src/pflib/CompilerDriver_ipfw_run.cpp
index 49c3bc3b3..6d1e05239 100644
--- a/src/pflib/CompilerDriver_ipfw_run.cpp
+++ b/src/pflib/CompilerDriver_ipfw_run.cpp
@@ -338,7 +338,7 @@ QString CompilerDriver_ipfw::run(const std::string &cluster_id,
     }
     catch (FWException &ex)
     {
-        status = BaseCompiler::ERROR;
+        status = BaseCompiler::FWCOMPILER_ERROR;
         return QString::fromUtf8(ex.toString().c_str());
     }
 
diff --git a/src/pflib/CompilerDriver_pf_run.cpp b/src/pflib/CompilerDriver_pf_run.cpp
index afa1fd96f..316b97733 100644
--- a/src/pflib/CompilerDriver_pf_run.cpp
+++ b/src/pflib/CompilerDriver_pf_run.cpp
@@ -758,7 +758,7 @@ QString CompilerDriver_pf::run(const std::string &cluster_id,
     }
     catch (FWException &ex)
     {
-        status = BaseCompiler::ERROR;
+        status = BaseCompiler::FWCOMPILER_ERROR;
         return QString::fromUtf8(ex.toString().c_str());
     }
 
diff --git a/src/pix/pix.cpp b/src/pix/pix.cpp
index a343484d3..d2978e250 100644
--- a/src/pix/pix.cpp
+++ b/src/pix/pix.cpp
@@ -175,7 +175,8 @@ int main(int argc, char **argv)
             driver.compile();
 
         delete objdb;
-        return (driver.getStatus() == BaseCompiler::SUCCESS) ? 0 : 1;
+
+        return (driver.getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1;
 
     } catch(libfwbuilder::FWException &ex)
     {
diff --git a/src/procurve_acl/procurve_acl.cpp b/src/procurve_acl/procurve_acl.cpp
index 708fd8695..e8315e3f3 100644
--- a/src/procurve_acl/procurve_acl.cpp
+++ b/src/procurve_acl/procurve_acl.cpp
@@ -162,7 +162,8 @@ int main(int argc, char **argv)
 
         driver.compile();
         delete objdb;
-        return (driver.getStatus() == BaseCompiler::SUCCESS) ? 0 : 1;
+
+        return (driver.getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1;
         
     } catch(libfwbuilder::FWException &ex)
     {