diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 2feec71c613d6b970cb18045a58a62738b27773c..c86fe7da456052f583913530c008a68289ae702f 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -104,7 +104,7 @@ EncAppCfg::EncAppCfg()
 #if !JVET_Q0806
 , m_bNoTriangleConstraintFlag(false)
 #else
-, m_bNoGeoConstraintFlag(false)
+, m_noGeoConstraintFlag(false)
 #endif
 , m_bNoLadfConstraintFlag(false)
 , m_noTransformSkipConstraintFlag(false)
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index 0ccf3f24665bc54a80c6b790803b143471c682d5..6b19ead333826217bb3305fc5c4c99770077416f 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -154,7 +154,7 @@ protected:
 #if !JVET_Q0806
   bool      m_bNoTriangleConstraintFlag;
 #else
-  bool      m_bNoGeoConstraintFlag;
+  bool      m_noGeoConstraintFlag;
 #endif
   bool      m_bNoLadfConstraintFlag;
   bool      m_noTransformSkipConstraintFlag;
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index a76d7bde584189801147ae611dc38374e832a159..623d63091637bdabc6cbfb826c5071d1674b68e3 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -780,8 +780,8 @@ public:
   bool      getNoTriangleConstraintFlag() const { return m_bNoTriangleConstraintFlag; }
   void      setNoTriangleConstraintFlag(bool bVal) { m_bNoTriangleConstraintFlag = bVal; }
 #else
-  bool      getNoGeoConstraintFlag() const { return m_bNoGeoConstraintFlag; }
-  void      setNoGeoConstraintFlag(bool bVal) { m_bNoGeoConstraintFlag = bVal; }
+  bool      getNoGeoConstraintFlag() const { return m_noGeoConstraintFlag; }
+  void      setNoGeoConstraintFlag(bool bVal) { m_noGeoConstraintFlag = bVal; }
 #endif
   bool      getNoLadfConstraintFlag() const { return m_bNoLadfConstraintFlag; }
   void      setNoLadfConstraintFlag(bool bVal) { m_bNoLadfConstraintFlag = bVal; }
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index ac265e300d877ff73a35c527283d79c7de330677..a382539b3954156adcde4ca1033cd68aa75f271c 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -993,7 +993,7 @@ void EncLib::xInitSPS( SPS& sps, VPS& vps )
 #if !JVET_Q0806
   cinfo->setNoTriangleConstraintFlag(m_bNoTriangleConstraintFlag);
 #else
-  cinfo->setNoGeoConstraintFlag(m_bNoGeoConstraintFlag);
+  cinfo->setNoGeoConstraintFlag(m_noGeoConstraintFlag);
 #endif
   cinfo->setNoLadfConstraintFlag(m_bNoLadfConstraintFlag);
   cinfo->setNoTransformSkipConstraintFlag(m_noTransformSkipConstraintFlag);